Commit: 3e06b84754cfb0c844d0c7dc455fbfec9b821776 - mingw-get (git)

The MinGW.org Installation Manager Tool

Commit MetaInfo

• Revision: 3e06b84754cfb0c844d0c7dc455fbfec9b821776 (tree)
• Zeit: 2011-11-07 06:30:14
• Autor: Keith Marshall <keithmarshall@user...>
• Commiter: Keith Marshall

Log Message

Fix packaging anomalies for source and licence distributions.

Ändern Zusammenfassung

• modified: ChangeLog
• modified: Makefile.in

Diff

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-11-06  Keith Marshall  <[e-mail]>
 
+	Fix packaging anomalies for source and licence distributions.
+
+	* Makefile.in (licdist): Link README from ${CURDIR}, not from '..'.
+	(srcdist): Explicitly link pkginfo.c from ${CURDIR} to src/pkginfo,
+	rather than as implied prerequisite; this avoids a bogus attempt to
+	link srcdist-doc into src/pkginfo.
+
[phone]  Keith Marshall  <[e-mail]>
+
 	Bump version number for subsequent CVS snapshots.
 
 	* configure.ac (AC_INIT): Set version to 0.4-alpha-1.1cvs

--- a/Makefile.in
+++ b/Makefile.in
@@ -199,12 +199,12 @@ licdist:
 	cd ./share/doc/${PACKAGE_TARNAME}; for file in $(LICENCE_FILES); \
 	  do test -f ${abs_top_srcdir}/$$file \
 	    && $(LN_S) ${abs_top_srcdir}/$$file . \
-	    || $(LN_S) ../$$file .; \
+	    || $(LN_S) ${CURDIR}/$$file .; \
 	  done
 	tar chf - share | $(TARZIP) -c > $(PACKAGE_DISTNAME)-lic.$(TAREXT)
 	rm -rf share
 
-srcdist: pkginfo.c srcdist-doc
+srcdist: srcdist-doc
 	rm -rf ${PACKAGE_DISTROOT} && mkdir ${PACKAGE_DISTROOT}
 	cd ${PACKAGE_DISTROOT}; for file in $(SRCDIST_FILES); do \
 	  test -f ${abs_top_srcdir}/$$file \
@@ -219,7 +219,7 @@ srcdist: pkginfo.c srcdist-doc
 	    fi; \
 	  done; \
 	cd ${CURDIR}; done
-	cd ${PACKAGE_DISTROOT}/src/pkginfo; $(LN_S) ${CURDIR}/$^ .
+	cd ${PACKAGE_DISTROOT}/src/pkginfo; $(LN_S) ${CURDIR}/pkginfo.c .
 	tar chf - ${PACKAGE_DISTROOT} | $(TARZIP) -c > \
 	  ${PACKAGE_DISTNAME}-src.$(TAREXT)
 	rm -rf ${PACKAGE_DISTROOT}