From b5988004d64d6c533e8bb09732a6f7cd4fb1194f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 12 May 2006 11:47:45 +0000 Subject: * Support for srcdir != builddir (NIX-41). --- corepkgs/buildenv/Makefile.am | 2 +- corepkgs/channels/Makefile.am | 2 +- corepkgs/nar/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'corepkgs') diff --git a/corepkgs/buildenv/Makefile.am b/corepkgs/buildenv/Makefile.am index 7a5df476d..eeab538ab 100644 --- a/corepkgs/buildenv/Makefile.am +++ b/corepkgs/buildenv/Makefile.am @@ -3,7 +3,7 @@ all-local: builder.pl install-exec-local: $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/buildenv - $(INSTALL_DATA) default.nix $(DESTDIR)$(datadir)/nix/corepkgs/buildenv + $(INSTALL_DATA) $(srcdir)/default.nix $(DESTDIR)$(datadir)/nix/corepkgs/buildenv $(INSTALL_PROGRAM) builder.pl $(DESTDIR)$(datadir)/nix/corepkgs/buildenv include ../../substitute.mk diff --git a/corepkgs/channels/Makefile.am b/corepkgs/channels/Makefile.am index 44540376d..d4d478f0e 100644 --- a/corepkgs/channels/Makefile.am +++ b/corepkgs/channels/Makefile.am @@ -3,7 +3,7 @@ all-local: unpack.sh install-exec-local: $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/channels - $(INSTALL_DATA) unpack.nix $(DESTDIR)$(datadir)/nix/corepkgs/channels + $(INSTALL_DATA) $(srcdir)/unpack.nix $(DESTDIR)$(datadir)/nix/corepkgs/channels $(INSTALL_PROGRAM) unpack.sh $(DESTDIR)$(datadir)/nix/corepkgs/channels include ../../substitute.mk diff --git a/corepkgs/nar/Makefile.am b/corepkgs/nar/Makefile.am index 741d7e9b3..103051e22 100644 --- a/corepkgs/nar/Makefile.am +++ b/corepkgs/nar/Makefile.am @@ -3,7 +3,7 @@ all-local: nar.sh install-exec-local: $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/nar - $(INSTALL_DATA) nar.nix $(DESTDIR)$(datadir)/nix/corepkgs/nar + $(INSTALL_DATA) $(srcdir)/nar.nix $(DESTDIR)$(datadir)/nix/corepkgs/nar $(INSTALL_PROGRAM) nar.sh $(DESTDIR)$(datadir)/nix/corepkgs/nar include ../../substitute.mk -- cgit v1.2.3