* Make perl a dependency of Nix.

This commit is contained in:
Eelco Dolstra 2004-03-15 15:23:53 +00:00
parent a5619f1dff
commit beda10f5a2
9 changed files with 15 additions and 7 deletions

View file

@ -47,6 +47,11 @@ AC_PATH_PROG(xmllint, xmllint)
AC_PATH_PROG(xsltproc, xsltproc) AC_PATH_PROG(xsltproc, xsltproc)
AC_PATH_PROG(flex, flex, false) AC_PATH_PROG(flex, flex, false)
AC_PATH_PROG(bison, bison, false) AC_PATH_PROG(bison, bison, false)
AC_PATH_PROG(perl, perl)
if test -z "$perl"; then
echo "Perl is required for Nix."
exit 1
fi
AC_ARG_WITH(docbook-catalog, AC_HELP_STRING([--with-docbook-catalog=PATH], AC_ARG_WITH(docbook-catalog, AC_HELP_STRING([--with-docbook-catalog=PATH],
[path of the DocBook XML DTD]), [path of the DocBook XML DTD]),

View file

@ -1,3 +1,5 @@
all-local: builder.pl
install-exec-local: install-exec-local:
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs
$(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/buildenv $(INSTALL) -d $(DESTDIR)$(datadir)/nix/corepkgs/buildenv
@ -6,4 +8,4 @@ install-exec-local:
include ../../substitute.mk include ../../substitute.mk
EXTRA_DIST = default.nix builder.pl EXTRA_DIST = default.nix builder.pl.in

View file

@ -1,4 +1,4 @@
#! /usr/bin/perl -w #! @perl@ -w
use strict; use strict;
use Cwd; use Cwd;

View file

@ -1,4 +1,4 @@
#! /usr/bin/perl -w #! @perl@ -w
use strict; use strict;
use IPC::Open2; use IPC::Open2;

View file

@ -1,4 +1,4 @@
#! /usr/bin/perl -w #! @perl@ -w
use strict; use strict;
use POSIX qw(tmpnam); use POSIX qw(tmpnam);

View file

@ -1,4 +1,4 @@
#! /usr/bin/perl -w #! @perl@ -w
use strict; use strict;
use IPC::Open2; use IPC::Open2;

View file

@ -1,4 +1,4 @@
#! /usr/bin/perl -w -I@libexecdir@/nix #! @perl@ -w -I@libexecdir@/nix
use strict; use strict;
use IPC::Open2; use IPC::Open2;

View file

@ -1,4 +1,4 @@
#! /usr/bin/perl -w #! @perl@ -w
use strict; use strict;
use POSIX qw(tmpnam); use POSIX qw(tmpnam);

View file

@ -9,6 +9,7 @@
-e "s^@storedir\@^$(storedir)^g" \ -e "s^@storedir\@^$(storedir)^g" \
-e "s^@system\@^$(system)^g" \ -e "s^@system\@^$(system)^g" \
-e "s^@wget\@^$(wget)^g" \ -e "s^@wget\@^$(wget)^g" \
-e "s^@perl\@^$(perl)^g" \
-e "s^@version\@^$(VERSION)^g" \ -e "s^@version\@^$(VERSION)^g" \
< $< > $@ || rm $@ < $< > $@ || rm $@
if test -x $<; then chmod +x $@; fi if test -x $<; then chmod +x $@; fi