* demo/Makefile.am (hc-libpath): Use parameters from the libtool

	in the top build directory, since the one in the demo directory is
	not guaranteed to exist.

diff --git a/ChangeLog b/ChangeLog
index d99bb19af1636b6c16c1fa4ef62b38e1e60d9392..16aeb4149a3084a2bd4f95ab248bc304e59ee170 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-10-31  Gordon Matzigkeit  <gord@trick.fig.org>
+
+       * demo/Makefile.am (hc-libpath): Use parameters from the libtool
+       in the top build directory, since the one in the demo directory is
+       not guaranteed to exist.
+
 1998-10-27  Alexandre Oliva  <oliva@dcc.unicamp.br>
 
        * demo/Makefile.am (objdir): there are no longer quotes around

diff --git a/demo/Makefile.am b/demo/Makefile.am
index e67faff4ab696af89116ea9e061e2e887a2b31c6..a9685212c0752eb3b3852cc6b2c851d2118608bb 100644 (file)
--- a/demo/Makefile.am
+++ b/demo/Makefile.am
@@ -35,7 +35,7 @@ helldl: libhello.la
 
 # Unfortunately, in order to test libtool thoroughly, we need access
 # to its private directory.
-objdir = `sed -n -e 's/^objdir=\(.*\)$$/\1/p' ./libtool`
+objdir = `sed -n -e 's/^objdir=\(.*\)$$/\1/p' ../libtool`
 
 TESTS = run.test
 
@@ -48,7 +48,7 @@ $(srcdir)/acinclude.m4:
 # Don't build helldl on unsupported platforms.
 helldl: $(helldl_OBJECTS) $(helldl_DEPENDENCIES)
        @rm -f helldl helldlT
-       @eval "`egrep '^global_symbol_pipe=' libtool`"; \
+       @eval "`egrep '^global_symbol_pipe=' ../libtool`"; \
        if test -z "$$global_symbol_pipe"; then \
          echo 'creating helldl (-dlopen is unsupported)'; \
          echo "#! /bin/sh" > helldlT; \
@@ -82,7 +82,7 @@ hc-libflag: $(hell_OBJECTS) $(hell_DEPENDENCIES)
        objdir=$(objdir); cd _hclibs && for lib in ../$$objdir/libhello*; do \
          $(LN_S) $$lib `echo "$$lib" | sed 's%^.*/%%'` || exit 1; \
        done
-       @eval `egrep -e '^(hardcode_.*|wl)=' ./libtool`; \
+       @eval `egrep -e '^(hardcode_.*|wl)=' ../libtool`; \
          libdir=`pwd`/$(objdir); \
          flag=`eval echo \"$$hardcode_libdir_flag_spec\"`; \
          if test -z "$$flag"; then \
@@ -99,7 +99,7 @@ hc-libflag: $(hell_OBJECTS) $(hell_DEPENDENCIES)
 hc-libpath: $(hell_OBJECTS) $(hell_DEPENDENCIES)
        @rm -f hc-libpath
        @echo "You may ignore any linking errors from the following command:"
-       @eval `egrep -e '^shlibpath_var=' ./libtool`; \
+       @eval `egrep -e '^shlibpath_var=' ../libtool`; \
          echo "$$shlibpath_var=./$(objdir) $(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -lhello -lm || echo unsupported > $@"; \
          eval "$$shlibpath_var=./$(objdir) $(CC) $(LDFLAGS) -o $@ $(hell_OBJECTS) -lhello -lm || echo unsupported > $@"