diff options
| author | Edwin Groothuis <edwin@FreeBSD.org> | 2003-03-30 03:04:33 +0000 |
|---|---|---|
| committer | Edwin Groothuis <edwin@FreeBSD.org> | 2003-03-30 03:04:33 +0000 |
| commit | f89a6b459429792c4da8df43a2448f7a1313ea0f (patch) | |
| tree | 51e5a0614c19b70096a9ce5bb833ee73b3c736e3 /devel/allegro-devel/files/patch-makefile.in | |
| parent | mail/gtkgrepmail run-depends on gnome-help-browser. (diff) | |
devel/allegro: updating to 4.1.4 (devel version).
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>
Notes
Notes:
svn path=/head/; revision=77725
Diffstat (limited to 'devel/allegro-devel/files/patch-makefile.in')
| -rw-r--r-- | devel/allegro-devel/files/patch-makefile.in | 56 |
1 files changed, 39 insertions, 17 deletions
diff --git a/devel/allegro-devel/files/patch-makefile.in b/devel/allegro-devel/files/patch-makefile.in index e4a8c951e1c4..67f7668497eb 100644 --- a/devel/allegro-devel/files/patch-makefile.in +++ b/devel/allegro-devel/files/patch-makefile.in @@ -1,8 +1,17 @@ ---- makefile.in.orig Thu Jul 4 05:20:02 2002 -+++ makefile.in Wed Nov 6 02:02:31 2002 -@@ -28,10 +28,10 @@ - LIBDIR = lib/unix +--- 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 @@ -14,7 +23,11 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ -@@ -249,6 +249,11 @@ ++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) @@ -26,24 +39,33 @@ modules: $(ALLEGRO_MODULE_TARGETS) -@@ -332,9 +337,9 @@ +@@ -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 $(libdir); \ -- $(INSTALL_DATA) $(LIBDIR)/lib$${l}-$(shared_version).so $(libdir)/; \ +- 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_DATA) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \ - $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(libdir)/; \ ++ $(INSTALL_PROGRAM) $(LIBDIR)/lib$${l}.so.$(shared_version) $(libdir)/; \ + $(INSTALL_DATA) $(LIBDIR)/lib$${l}_unsharable.a $(DESTDIR)$(libdir)/; \ fi; \ done -@@ -347,20 +352,20 @@ + @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) $(bindir) - @echo Installing allegro-config to $(bindir) -- @$(INSTALL_PROGRAM) allegro-config $(bindir) + $(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) \ @@ -54,7 +76,7 @@ - echo "$(libdir) each time you want to run an Allegro program." ; \ - ) ; \ - fi -+ @$(INSTALL) allegro-config $(bindir) ++ @$(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) \ @@ -66,8 +88,8 @@ +# ) ; \ +# fi @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}); \ +- 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; \ |