diff options
Diffstat (limited to 'devel/allegro-devel/files/patch-makefile.in')
| -rw-r--r-- | devel/allegro-devel/files/patch-makefile.in | 32 |
1 files changed, 10 insertions, 22 deletions
diff --git a/devel/allegro-devel/files/patch-makefile.in b/devel/allegro-devel/files/patch-makefile.in index d62d72d642ac..36e512e4f03c 100644 --- a/devel/allegro-devel/files/patch-makefile.in +++ b/devel/allegro-devel/files/patch-makefile.in @@ -1,47 +1,44 @@ ---- makefile.in.orig Mon Dec 10 11:37:39 2001 -+++ makefile.in Thu Feb 14 08:59:06 2002 +--- makefile.in.orig Thu Jul 4 04:20:02 2002 ++++ makefile.in Tue Oct 22 00:31:27 2002 @@ -31,7 +31,7 @@ ACLOCAL = aclocal ACLOCAL_M4 = $(srcdir)/aclocal.m4 AUTOCONF = autoconf -AUTOHEADER = autoheader -+AUTOHEADER =autoheader213 ++AUTOHEADER = autoheader213 INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -323,18 +323,19 @@ +@@ -347,17 +347,17 @@ fi $(mkinstalldirs) $(bindir) @echo Installing allegro-config to $(bindir) - @$(INSTALL_PROGRAM) allegro-config $(bindir) - @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \ -- (grep -q $(libdir) /etc/ld.so.conf || \ +- (cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \ - test $(libdir) = /lib || test $(libdir) = /usr/lib) \ - && ($(LDCONFIG) $(libdir) || true) || (\ - echo "" ; \ - echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \ - echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH to include"; \ - echo "$(libdir) each time you want to run an Allegro program." ; \ -- $(LDCONFIG) -n $(libdir) ; \ - ) ; \ - fi + @$(INSTALL) allegro-config $(bindir) -+# Don't worry about this, +# @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \ -+# (grep -q $(libdir) /etc/ld.so.conf || \ ++# (cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \ +# test $(libdir) = /lib || test $(libdir) = /usr/lib) \ +# && ($(LDCONFIG) $(libdir) || true) || (\ +# echo "" ; \ +# echo "Warning: shared library destination $(libdir) is not in ldd search path." ; \ +# echo "Unless you add it to /etc/ld.so.conf, you must set LD_LIBRARY_PATH to include"; \ +# echo "$(libdir) each time you want to run an Allegro program." ; \ -+# $(LDCONFIG) $(libdir) ; \ +# ) ; \ +# fi - - install-headers: - $(mkinstalldirs) $(includedir)/allegro -@@ -367,7 +368,7 @@ + @for l in alleg alld allp; do \ + if test -f $(libdir)/lib$${l}-$(shared_version).so -a \! -L $(libdir)/lib$${l}.so.${shared_major_minor}; then \ + (cd $(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \ +@@ -395,7 +395,7 @@ @for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES); do \ if test "X`echo $$prog | sed -e s,tools/.\*,,`" = X; then \ echo Installing $$prog to $(bindir); \ @@ -50,12 +47,3 @@ fi; \ done -@@ -424,7 +425,7 @@ - @for l in alleg alld allp; do \ - rm -f $(libdir)/lib$${l}-${shared_version}.so; \ - done -- $(LDCONFIG) -n $(libdir) # remove symlinks -+ $(LDCONFIG) $(libdir) # remove symlinks - -$(LDCONFIG) $(libdir) # update cache (only works if we're root) - - uninstall-modules: |