- typo

[packages/allegro.git] / allegro-makefile.patch

diff --git a/allegro-makefile.patch b/allegro-makefile.patch
index a13d98a714a9bac63e82606f06b6c4d05ab4f1c2..ef8acb31a2505153a1086b4e5cbbfeb204d07a61 100644 (file)
--- a/allegro-makefile.patch
+++ b/allegro-makefile.patch
@@ -1,24 +1,35 @@
---- allegro-4.0.1/makefile.in.orig     Fri Mar 29 17:34:51 2002
-+++ allegro-4.0.1/makefile.in  Fri Mar 29 18:02:08 2002
-@@ -300,90 +300,90 @@
+--- allegro/makefile.in        Thu Aug 22 15:33:21 2002
++++ allegro/makefile.in.new    Thu Aug 22 15:31:53 2002
+@@ -26,7 +26,7 @@
+ OBJ = .o
+ OBJDIR = obj/unix
+ LIBDIR = lib/unix
+-INFO_DIR = $(infodir)/dir
++INFO_DIR = $(DESTDIR)$(infodir)/dir
+ 
+ ACLOCAL = aclocal
+ ACLOCAL_M4 = $(srcdir)/aclocal.m4
+@@ -323,91 +323,91 @@
        @echo "and/or make install-gzipped-info"
  
  install-lib: lib
 -      $(mkinstalldirs) $(libdir)
 +      $(mkinstalldirs) $(DESTDIR)$(libdir)
        @for l in alleg alld allp; do \
-         if test -f $(LIBDIR)/lib$${l}.a; then \
+-        if test -f $(LIBDIR)/lib$${l}.a; then \
 -          echo Installing $(LIBDIR)/lib$${l}.a to $(libdir); \
 -          $(INSTALL_DATA) $(LIBDIR)/lib$${l}.a $(libdir)/; \
++        if test -f $(LIBDIR)/lib$${l}.a; then \
 +          echo Installing $(LIBDIR)/lib$${l}.a to $(DESTDIR)$(libdir); \
 +          $(INSTALL_DATA) $(LIBDIR)/lib$${l}.a $(DESTDIR)$(libdir)/; \
          fi; \
        done
        @for l in alleg alld allp; do \
-         if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
+-        if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
 -          echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(libdir); \
 -          $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(libdir)/; \
 -          $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(libdir)/; \
++        if test -f $(LIBDIR)/lib$${l}-$(shared_version).so; then \
 +          echo Installing $(LIBDIR)/lib$${l}-$(shared_version).so to $(DESTDIR)$(libdir); \
 +          $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(DESTDIR)$(libdir)/; \
 +          $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
@@ -37,14 +48,15 @@
 -      $(mkinstalldirs) $(bindir)
 -      @echo Installing allegro-config to $(bindir)
 -      @$(INSTALL_PROGRAM) allegro-config $(bindir)
+-      @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \
+-              (cat /etc/ld.so.conf | grep $(libdir) >/dev/null || \
+-               test $(libdir) = /lib || test $(libdir) = /usr/lib) \
+-              && ($(LDCONFIG) $(libdir) || true) || (\
 +      $(mkinstalldirs) $(DESTDIR)$(bindir)
 +      @echo Installing allegro-config to $(DESTDIR)$(bindir)
 +      @$(INSTALL_PROGRAM) allegro-config $(DESTDIR)$(bindir)
-       @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \
--              (grep -q $(libdir) /etc/ld.so.conf || \
--               test $(libdir) = /lib || test $(libdir) = /usr/lib) \
--              && ($(LDCONFIG) $(libdir) || true) || (\
-+              (grep -q $(DESTDIR)$(libdir) /etc/ld.so.conf || \
++      @if test -n "$(LIBDIR)/liball*-$(shared_version).so"; then \
++              (cat /etc/ld.so.conf | grep $(DESTDIR)$(libdir) >/dev/null || \
 +               test $(DESTDIR)$(libdir) = /lib || test $(DESTDIR)$(libdir) = /usr/lib) \
 +              && ($(LDCONFIG) $(DESTDIR)$(libdir) || true) || (\
                        echo "" ; \
@@ -108,8 +120,9 @@
  install-programs: programs
 -      $(mkinstalldirs) $(bindir)
 +      $(mkinstalldirs) $(DESTDIR)$(bindir)
-       @for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES); do \
-         if test "X`echo $$prog | sed -e s,tools/.\*,,`" = X; then \
+       @for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES) \
+         $(ALLEGRO_EXAMPLE_EXES) ; do \
+         if test "X`echo $$prog | sed -e s,.*/.\*,,`" = X; then \
 -          echo Installing $$prog to $(bindir); \
 -          $(INSTALL_PROGRAM) $$prog $(bindir); \
 +          echo Installing $$prog to $(DESTDIR)$(bindir); \
@@ -124,7 +137,7 @@
 +      $(mkinstalldirs) $(DESTDIR)$(infodir)
 +      @$(INSTALL_DATA) docs/info/allegro.info $(DESTDIR)$(infodir)
        -@if $(SHELL) -c "$(INSTALL_INFO) --version" >/dev/null 2>&1; then \
-         if $(INSTALL_INFO) --version 2>&1 | grep -q "Debian"; then \
+         if $(INSTALL_INFO) --version 2>&1 | grep "Debian" >/dev/null; then \
 -          $(INSTALL_INFO) --section Development -- $(infodir)/allegro.info; \
 +          $(INSTALL_INFO) --section Development -- $(DESTDIR)$(infodir)/allegro.info; \
          else \
@@ -133,7 +146,7 @@
          fi; \
        else \
          true; \
-@@ -391,21 +391,21 @@
+@@ -415,21 +415,21 @@
  
  install-gzipped-info: install-info
        @echo Compressing documentation...
@@ -163,7 +176,7 @@
        done
  
  uninstall: uninstall-lib uninstall-modules uninstall-headers uninstall-programs uninstall-info uninstall-man
-@@ -418,57 +418,57 @@
+@@ -442,58 +442,58 @@
  uninstall-lib:
        @echo "Uninstalling libraries..."
        @for l in alleg alld allp; do \
@@ -201,9 +214,10 @@
 +      rm -rf $(DESTDIR)$(includedir)/allegro
  
  uninstall-programs:
-       @for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES); do \
-         if test "X`echo $$prog | sed -e s,tools/.\*,,`" = X; then \
-           p=`echo $$prog | sed -e s,tools/,,`; \
+       @for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES) \
+         $(ALLEGRO_EXAMPLE_EXES) ; do \
+         if test "X`echo $$prog | sed -e s,.*/.\*,,`" = X; then \
+           p=`echo $$prog | sed -e s,,,`; \
 -          echo rm -f $(bindir)/$$p; \
 -          rm -f $(bindir)/$$p; \
 +          echo rm -f $(DESTDIR)$(bindir)/$$p; \
@@ -219,7 +233,7 @@
 +        gunzip $(DESTDIR)$(infodir)/allegro.info.gz; \
        fi;
        -@if $(SHELL) -c "$(INSTALL_INFO) --version" >/dev/null 2>&1; then \
-         if $(INSTALL_INFO) --version 2>&1 | grep -q "Debian"; then \
+         if $(INSTALL_INFO) --version 2>&1 | grep "Debian" >/dev/null; then \
 -          $(INSTALL_INFO) --remove $(infodir)/allegro.info; \
 +          $(INSTALL_INFO) --remove $(DESTDIR)$(infodir)/allegro.info; \
          else \