diff options
| author | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-12-10 23:29:22 +0000 |
|---|---|---|
| committer | goodale <goodale@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2000-12-10 23:29:22 +0000 |
| commit | e811a23be47c21ba1b7f12319cc97bebd213211b (patch) | |
| tree | 228758d25f81fec2604e325b054beed252fe3fc9 /lib | |
| parent | 9f834c31473704b842e746860f36fc32cafd137c (diff) | |
Fixing path to perl script under non-cygwin stuff which was broken by my last
commit.
Tom
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1919 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/make/configure | 5 | ||||
| -rw-r--r-- | lib/make/configure.in | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/lib/make/configure b/lib/make/configure index 08032f89..7176c307 100755 --- a/lib/make/configure +++ b/lib/make/configure @@ -4119,11 +4119,14 @@ EOF # The perl scripts run by the make system need to have their names # changed if under cygwin - e.g. //d/foo needs to be d:/foo +PERL_CONFIGURE_SCRIPT="$srcdir/configure.pl" + if test "$host_os" = "cygwin" ; then - PERL_CONFIGURE_SCRIPT=`echo $srcdir/configure.pl | sed 's,^/cygdrive/\(.\)/,\1:/,' | sed 's,^//\(.\)/,\1:/,'` + PERL_CONFIGURE_SCRIPT=`echo $PERL_CONFIGURE_SCRIPT | sed 's,^/cygdrive/\(.\)/,\1:/,' | sed 's,^//\(.\)/,\1:/,'` fi + BUILD_ACTIVETHORNS='$(CCTK_HOME)/lib/sbin/BuildActiveThorns.pl' diff --git a/lib/make/configure.in b/lib/make/configure.in index 47fb0c6d..7613affd 100644 --- a/lib/make/configure.in +++ b/lib/make/configure.in @@ -707,10 +707,13 @@ AC_DEFINE_UNQUOTED(MKDIRFLAGS, " $MKDIRFLAGS ") # The perl scripts run by the make system need to have their names # changed if under cygwin - e.g. //d/foo needs to be d:/foo +PERL_CONFIGURE_SCRIPT="$srcdir/configure.pl" + if test "$host_os" = "cygwin" ; then - PERL_CONFIGURE_SCRIPT=`echo $srcdir/configure.pl | sed 's,^/cygdrive/\(.\)/,\1:/,' | sed 's,^//\(.\)/,\1:/,'` + PERL_CONFIGURE_SCRIPT=`echo $PERL_CONFIGURE_SCRIPT | sed 's,^/cygdrive/\(.\)/,\1:/,' | sed 's,^//\(.\)/,\1:/,'` fi + AC_SUBST(BUILD_ACTIVETHORNS) BUILD_ACTIVETHORNS='$(CCTK_HOME)/lib/sbin/BuildActiveThorns.pl' |