[77678] trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff

[jmr at macports.org]

Revision: 77678
          http://trac.macports.org/changeset/77678
Author:   jmr at macports.org
Date:     2011-04-08 16:50:02 -0700 (Fri, 08 Apr 2011)
Log Message:
-----------
file: fix build with with_text_magic_file variant (#23710)

Modified Paths:
--------------
    trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff

Modified: trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff
===================================================================
--- trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff	2011-04-08 20:06:47 UTC (rev 77677)
+++ trunk/dports/sysutils/file/files/patch-magic-Makefile.in.diff	2011-04-08 23:50:02 UTC (rev 77678)
@@ -1,6 +1,6 @@
 --- magic/Makefile.in.orig	2010-01-22 13:44:34.000000000 -0800
 +++ magic/Makefile.in	2010-02-08 16:43:06.000000000 -0800
-@@ -171,7 +171,7 @@
+@@ -175,7 +175,7 @@
  MAGIC_FRAGMENT_BASE = Magdir
  MAGIC_DIR = $(top_srcdir)/magic
  MAGIC_FRAGMENT_DIR = $(MAGIC_DIR)/$(MAGIC_FRAGMENT_BASE)
@@ -9,11 +9,12 @@
  EXTRA_DIST = \
  $(MAGIC_DIR)/Header \
  $(MAGIC_DIR)/Localstuff \
-@@ -585,6 +585,15 @@
- 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
- 	uninstall uninstall-am uninstall-pkgdataDATA
- 
-+magic: $(EXTRA_DIST)
+@@ -606,6 +606,17 @@
+ 	@mkdir magic && cp -p $(EXTRA_DIST) magic
+ 	$(FILE_COMPILE) -C -m magic
+ 	@rm -fr magic
++
++magic: $(EXTRA_DIST) ${MAGIC}
 +	for frag in $(EXTRA_DIST); do \
 +		if test -f $(srcdir)/$$frag; then \
 +			f=$(srcdir)/$$frag; \
@@ -22,6 +23,7 @@
 +		fi; \
 +		cat $$f; \
 +	done >> $@
- 
- ${MAGIC}: $(EXTRA_DIST) $(FILE_COMPILE_DEP)
- 	@mkdir magic && cp -p $(EXTRA_DIST) magic
++
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110408/15c58fed/attachment.html>