Index: scripts/Makefile.am
===================================================================
--- scripts/Makefile.am	(revision 21019)
+++ scripts/Makefile.am	(working copy)
@@ -11,17 +11,17 @@
 
 install-exec-local: readmanifest.pm download-using-manifests.pl copy-from-other-stores.pl find-runtime-roots.pl
 	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/profile.d
-	$(INSTALL_PROGRAM) nix-profile.sh $(DESTDIR)$(sysconfdir)/profile.d/nix.sh
+	$(INSTALL_SCRIPT) nix-profile.sh $(DESTDIR)$(sysconfdir)/profile.d/nix.sh
 	$(INSTALL) -d $(DESTDIR)$(libexecdir)/nix
 	$(INSTALL_DATA) readmanifest.pm $(DESTDIR)$(libexecdir)/nix 
 	$(INSTALL_DATA) readconfig.pm $(DESTDIR)$(libexecdir)/nix 
 	$(INSTALL_DATA) ssh.pm $(DESTDIR)$(libexecdir)/nix 
-	$(INSTALL_PROGRAM) find-runtime-roots.pl $(DESTDIR)$(libexecdir)/nix 
-	$(INSTALL_PROGRAM) generate-patches.pl $(DESTDIR)$(libexecdir)/nix 
-	$(INSTALL_PROGRAM) build-remote.pl $(DESTDIR)$(libexecdir)/nix 
+	$(INSTALL_SCRIPT) find-runtime-roots.pl $(DESTDIR)$(libexecdir)/nix 
+	$(INSTALL_SCRIPT) generate-patches.pl $(DESTDIR)$(libexecdir)/nix 
+	$(INSTALL_SCRIPT) build-remote.pl $(DESTDIR)$(libexecdir)/nix 
 	$(INSTALL) -d $(DESTDIR)$(libexecdir)/nix/substituters
-	$(INSTALL_PROGRAM) download-using-manifests.pl $(DESTDIR)$(libexecdir)/nix/substituters
-	$(INSTALL_PROGRAM) copy-from-other-stores.pl $(DESTDIR)$(libexecdir)/nix/substituters
+	$(INSTALL_SCRIPT) download-using-manifests.pl $(DESTDIR)$(libexecdir)/nix/substituters
+	$(INSTALL_SCRIPT) copy-from-other-stores.pl $(DESTDIR)$(libexecdir)/nix/substituters
 	$(INSTALL) -d $(DESTDIR)$(sysconfdir)/nix
 
 include ../substitute.mk
Index: corepkgs/nar/Makefile.am
===================================================================
--- corepkgs/nar/Makefile.am	(revision 21019)
+++ corepkgs/nar/Makefile.am	(working copy)
@@ -4,7 +4,7 @@
 	$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
 	$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/nar
 	$(INSTALL_DATA) $(srcdir)/nar.nix $(DESTDIR)$(datadir)/nix/corepkgs/nar
-	$(INSTALL_PROGRAM) nar.sh $(DESTDIR)$(datadir)/nix/corepkgs/nar
+	$(INSTALL_SCRIPT) nar.sh $(DESTDIR)$(datadir)/nix/corepkgs/nar
 
 include ../../substitute.mk
 
Index: corepkgs/buildenv/Makefile.am
===================================================================
--- corepkgs/buildenv/Makefile.am	(revision 21019)
+++ corepkgs/buildenv/Makefile.am	(working copy)
@@ -4,7 +4,7 @@
 	$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
 	$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/buildenv
 	$(INSTALL_DATA) $(srcdir)/default.nix $(DESTDIR)$(datadir)/nix/corepkgs/buildenv
-	$(INSTALL_PROGRAM) builder.pl $(DESTDIR)$(datadir)/nix/corepkgs/buildenv
+	$(INSTALL_SCRIPT) builder.pl $(DESTDIR)$(datadir)/nix/corepkgs/buildenv
 
 include ../../substitute.mk
 
Index: corepkgs/channels/Makefile.am
===================================================================
--- corepkgs/channels/Makefile.am	(revision 21019)
+++ corepkgs/channels/Makefile.am	(working copy)
@@ -4,7 +4,7 @@
 	$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
 	$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/channels
 	$(INSTALL_DATA) $(srcdir)/unpack.nix $(DESTDIR)$(datadir)/nix/corepkgs/channels
-	$(INSTALL_PROGRAM) unpack.sh $(DESTDIR)$(datadir)/nix/corepkgs/channels
+	$(INSTALL_SCRIPT) unpack.sh $(DESTDIR)$(datadir)/nix/corepkgs/channels
 
 include ../../substitute.mk
 
