f89a6b4594
This PR updates allegro to the last 4.1.4, fixes allegro-config, and adds samples. PR: ports/45344 Submitted by: Thierry Thomas <thierry@pompo.net>
97 lines
3.7 KiB
Text
97 lines
3.7 KiB
Text
--- makefile.in.orig Wed Oct 23 08:08:26 2002
|
|
+++ makefile.in Sun Nov 10 23:37:39 2002
|
|
@@ -20,7 +20,7 @@
|
|
mandir = @mandir@
|
|
libdir = @libdir@
|
|
modulebasedir = @libdir@/allegro
|
|
-moduledir = $(modulebasedir)/$(shared_major_minor)
|
|
+moduledir = $(modulebasedir)/$(shared_version)
|
|
|
|
EXE =
|
|
OBJ = .o
|
|
@@ -29,13 +29,14 @@
|
|
INFO_DIR = $(infodir)/dir
|
|
DESTDIR =
|
|
|
|
-ACLOCAL = aclocal
|
|
+ACLOCAL = true
|
|
ACLOCAL_M4 = $(srcdir)/aclocal.m4
|
|
-AUTOCONF = autoconf
|
|
-AUTOHEADER = autoheader
|
|
+AUTOCONF = true
|
|
+AUTOHEADER = true
|
|
|
|
INSTALL = @INSTALL@
|
|
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
|
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
|
INSTALL_DATA = @INSTALL_DATA@
|
|
INSTALL_INFO = @INSTALL_INFO@
|
|
|
|
@@ -262,6 +263,11 @@
|
|
all: lib modules programs docs
|
|
|
|
lib: $(ALLEGRO_LIB_TARGETS)
|
|
+ @for l in alleg alld allp; do \
|
|
+ if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \
|
|
+ ln -sf lib$${l}.so.$(shared_version) $(LIBDIR)/lib$${l}.so; \
|
|
+ fi; \
|
|
+ done
|
|
|
|
modules: $(ALLEGRO_MODULE_TARGETS)
|
|
|
|
@@ -349,35 +355,37 @@
|
|
fi; \
|
|
done
|
|
@for l in alleg alld allp; do \
|
|
- 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)/; \
|
|
+ if test -f $(LIBDIR)/lib$${l}.so.$(shared_version); then \
|
|
+ echo Installing $(LIBDIR)/lib$${l}.so.$(shared_version) to $(libdir); \
|
|
+ $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \
|
|
$(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \
|
|
fi; \
|
|
done
|
|
@if test -n "$(ALLEGRO_MODULE_TARGETS)"; then \
|
|
$(mkinstalldirs) $(DESTDIR)$(moduledir); \
|
|
- for m in $(ALLEGRO_MODULE_TARGETS) modules.lst; do \
|
|
+ for m in $(ALLEGRO_MODULE_TARGETS); do \
|
|
echo Installing $$m to $(DESTDIR)$(moduledir); \
|
|
- $(INSTALL_DATA) $$m $(DESTDIR)$(moduledir)/; \
|
|
+ $(INSTALL_PROGRAM) $$m $(DESTDIR)$(moduledir)/; \
|
|
done; \
|
|
+ echo Installing modules.lst to $(DESTDIR)$(moduledir); \
|
|
+ $(INSTALL_DATA) modules.lst $(DESTDIR)$(moduledir)/; \
|
|
fi
|
|
$(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 \
|
|
- (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." ; \
|
|
- ) ; \
|
|
- fi
|
|
+ @$(INSTALL_SCRIPT) allegro-config $(DESTDIR)$(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) || (\
|
|
+# 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." ; \
|
|
+# ) ; \
|
|
+# fi
|
|
@for l in alleg alld allp; do \
|
|
- if test -f $(DESTDIR)$(libdir)/lib$${l}-$(shared_version).so -a \! -h $(DESTDIR)$(libdir)/lib$${l}.so.${shared_major_minor}; then \
|
|
- (cd $(DESTDIR)$(libdir); ln -s lib$${l}-$(shared_version).so lib$${l}.so.${shared_major_minor}); \
|
|
+ if test -f $(libdir)/lib$${l}.so.$(shared_version) -a \! -L $(libdir)/lib$${l}.so; then \
|
|
+ (cd $(libdir); ln -s lib$${l}.so.$(shared_version) lib$${l}.so); \
|
|
fi; \
|
|
done
|
|
|