* Generate nar.sh, fetchurl.sh.

configure.ac

@@ -12,5 +12,7 @@ AC_PROG_CXX
 AC_PROG_RANLIB
 
 AM_CONFIG_HEADER([config.h])
-AC_CONFIG_FILES([Makefile src/Makefile scripts/Makefile corepkgs/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile scripts/Makefile
+			  corepkgs/Makefile corepkgs/fetchurl/Makefile
+			  corepkgs/nar/Makefile])
 AC_OUTPUT

corepkgs/Makefile.am

@@ -1,10 +1 @@
-install-data-local:
-	$(INSTALL) -d $(datadir)/fix
-	$(INSTALL) -d $(datadir)/fix/fetchurl
-	$(INSTALL_DATA) fetchurl/fetchurl.fix $(datadir)/fix/fetchurl
-	$(INSTALL_DATA) fetchurl/fetchurl.sh $(datadir)/fix/fetchurl
-	$(INSTALL) -d $(datadir)/fix/nar
-	$(INSTALL_DATA) nar/nar.fix $(datadir)/fix/nar
-	$(INSTALL_DATA) nar/nar.sh $(datadir)/fix/nar
-	$(INSTALL_DATA) nar/unnar.fix $(datadir)/fix/nar
-	$(INSTALL_DATA) nar/unnar.sh $(datadir)/fix/nar
+SUBDIRS = fetchurl nar

corepkgs/fetchurl/Makefile.am

@@ -0,0 +1,8 @@
+all-local: fetchurl.sh
+
+install-exec-local:
+	$(INSTALL) -d $(datadir)/fix/fetchurl
+	$(INSTALL_DATA) fetchurl.fix $(datadir)/fix/fetchurl
+	$(INSTALL_DATA) fetchurl.sh $(datadir)/fix/fetchurl
+
+include ../../substitute.mk

corepkgs/nar/Makefile.am

@@ -0,0 +1,10 @@
+all-local: nar.sh unnar.sh
+
+install-exec-local:
+	$(INSTALL) -d $(datadir)/fix/nar
+	$(INSTALL_DATA) nar.fix $(datadir)/fix/nar
+	$(INSTALL_DATA) nar.sh $(datadir)/fix/nar
+	$(INSTALL_DATA) unnar.fix $(datadir)/fix/nar
+	$(INSTALL_DATA) unnar.sh $(datadir)/fix/nar
+
+include ../../substitute.mk

corepkgs/nar/nar.sh

@@ -1,5 +0,0 @@
-#! /bin/sh
-
-echo "packing $path into $out..."
-/nix/bin/nix --dump --file "$path" | bzip2 > $out || exit 1
-

corepkgs/nar/nar.sh.in

@@ -0,0 +1,5 @@
+#! /bin/sh
+
+echo "packing $path into $out..."
+@bindir@/nix --dump --file "$path" | bzip2 > $out || exit 1
+

corepkgs/nar/unnar.sh

@@ -1,4 +0,0 @@
-#! /bin/sh
-
-echo "unpacking $nar to $out..."
-bunzip2 < $nar | /nix/bin/nix --restore "$out" || exit 1

corepkgs/nar/unnar.sh.in

@@ -0,0 +1,4 @@
+#! /bin/sh
+
+echo "unpacking $nar to $out..."
+bunzip2 < $nar | @bindir@/nix --restore "$out" || exit 1

scripts/Makefile.am

@@ -10,10 +10,4 @@ install-exec-local:
 # !!! don't overwrite local modifications
 	$(INSTALL_DATA) prebuilts.conf $(sysconfdir)/nix/prebuilts.conf
 
-%: %.in Makefile
-	sed \
-	 -e s^@prefix\@^$(prefix)^g \
-	 -e s^@sysconfdir\@^$(sysconfdir)^g \
-	 -e s^@localstatedir\@^$(localstatedir)^g \
-	 < $< > $@ || rm $@
-	chmod +x $@
+include ../substitute.mk