-diff -uNr allegro-4.0.2/makefile.in allegro-4.0.2.new/makefile.in
---- allegro-4.0.2/makefile.in Fri Jun 21 14:49:50 2002
-+++ allegro-4.0.2.new/makefile.in Fri Jun 21 15:13:37 2002
+--- allegro-4.0.2/makefile.in.orig Fri Jul 5 17:48:43 2002
++++ allegro-4.0.2/makefile.in Fri Jul 5 17:52:29 2002
@@ -392,8 +392,9 @@
install-programs: programs
- $(mkinstalldirs) $(DESTDIR)$(bindir)
+ $(mkinstalldirs) $(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 $(DESTDIR)$(bindir); \
- $(INSTALL_PROGRAM) $$prog $(DESTDIR)$(bindir); \
+ echo Installing $$prog to $(bindir); \
+ $(INSTALL_PROGRAM) $$prog $(bindir); \
fi; \
@@ -465,9 +466,10 @@
- rm -rf $(DESTDIR)$(includedir)/allegro
+ rm -rf $(includedir)/allegro
uninstall-programs:
- @for prog in $(ALLEGRO_LIB_EXES) $(ALLEGRO_DATAFILE_EXES); do \
+ $(ALLEGRO_EXAMPLE_EXES) ; do \
+ if test "X`echo $$prog | sed -e s,.*/.\*,,`" = X; then \
+ p=`echo $$prog | sed -e s,,,`; \
- echo rm -f $(DESTDIR)$(bindir)/$$p; \
- rm -f $(DESTDIR)$(bindir)/$$p; \
+ echo rm -f $(bindir)/$$p; \
+ rm -f $(bindir)/$$p; \
fi; \
---- allegro-4.0.1/makefile.in.orig Sun Jun 16 21:43:10 2002
-+++ allegro-4.0.1/makefile.in Fri Jun 21 11:48:38 2002
+--- 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
ACLOCAL = aclocal
ACLOCAL_M4 = $(srcdir)/aclocal.m4
-@@ -324,90 +324,90 @@
+@@ -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)/; \
- $(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 \
-- (echo $(libdir) | grep /etc/ld.so.conf >/dev/null || \
-- test $(libdir) = /lib || test $(libdir) = /usr/lib) \
-- && ($(LDCONFIG) $(libdir) || true) || (\
-+ (echo $(DESTDIR)$(libdir) | grep /etc/ld.so.conf >/dev/null || \
++ @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 "" ; \
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); \
done
uninstall: uninstall-lib uninstall-modules uninstall-headers uninstall-programs uninstall-info uninstall-man
-@@ -442,57 +442,57 @@
+@@ -442,58 +442,58 @@
uninstall-lib:
@echo "Uninstalling libraries..."
@for l in alleg alld allp; do \
+ 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; \