Hmmm, amazing, as soon as I saw the patch on the mailing list I realized
I could use a variable that's already set by autoconf/automake instead
of the PWD thing. :-D
Here's the version that properly embraces autoconf/automake.
Kelly Anderson wrote:
I've attached some subtle fixes to get VPATH builds working
correctly. I'm a firm believer in building outside the source tree
(when possible).
Regards,
Kelly
------------------------------------------------------------------------
_______________________________________________
Warzone-dev mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-dev
--- ./data/Makefile.am.orig 2008-01-07 13:43:35.573533866 -0700
+++ ./data/Makefile.am 2008-01-07 13:44:53.484548212 -0700
@@ -15,17 +15,17 @@ data: $(BASEARCHIVE) $(PATCHARCHIVE)
$(MAKE) $(AM_MAKEFLAGS) -C mods data
$(BASEARCHIVE): $(BASELIST)
- zip -ru0 $@ $(BASELIST) -x *svn*
+ (cd $(srcdir) && zip -ru0 $(abs_builddir)/$@ $(BASELIST) -x *svn*)
zip -T $@
$(PATCHARCHIVE): $(PATCHLIST:%=mp/%)
- cd mp && zip -ru0 ../$@ $(PATCHLIST) -x *svn*
+ (cd $(srcdir)/mp && zip -ru0 $(abs_builddir)/$@ $(PATCHLIST) -x *svn*)
zip -T $@
install-data-local: $(BASEARCHIVE) $(PATCHARCHIVE)
$(MKDIR_P) $(DESTDIR)$(pkgdatadir)
- $(INSTALL_DATA) $(srcdir)/$(BASEARCHIVE)
$(DESTDIR)$(pkgdatadir)/$(BASEARCHIVE)
- $(INSTALL_DATA) $(srcdir)/$(PATCHARCHIVE)
$(DESTDIR)$(pkgdatadir)/$(PATCHARCHIVE)
+ $(INSTALL_DATA) $(BASEARCHIVE) $(DESTDIR)$(pkgdatadir)/$(BASEARCHIVE)
+ $(INSTALL_DATA) $(PATCHARCHIVE) $(DESTDIR)$(pkgdatadir)/$(PATCHARCHIVE)
uninstall-local:
rm -f $(DESTDIR)$(pkgdatadir)/$(BASEARCHIVE)
--- ./data/mods/global/Makefile.am.orig 2008-01-07 13:43:32.996638143 -0700
+++ ./data/mods/global/Makefile.am 2008-01-07 13:52:09.821515289 -0700
@@ -13,22 +13,22 @@ CLEANFILES=$(AIVOLUTIONARCHIVE) $(GRIMAR
data: $(AIVOLUTIONARCHIVE) $(GRIMARCHIVE) $(NEWST_TILESARCHIVE)
$(AIVOLUTIONARCHIVE): $(AIVOLUTIONLIST:%=aivolution/%)
- cd aivolution && zip -ru0 ../$@ $(AIVOLUTIONLIST) -x *svn*
+ (cd $(srcdir)/aivolution && zip -ru0 $(abs_builddir)/$@
$(AIVOLUTIONLIST) -x *svn*)
zip -T $@
$(GRIMARCHIVE): $(GRIMLIST:%=grim/%)
- cd grim && zip -ru0 ../$@ $(GRIMLIST) -x *svn*
+ (cd $(srcdir)/grim && zip -ru0 $(abs_builddir)/$@ $(GRIMLIST) -x *svn*)
zip -T $@
$(NEWST_TILESARCHIVE): $(NEWST_TILESLIST:%=newst_tiles/%)
- cd newst_tiles && zip -ru0 ../$@ $(NEWST_TILESLIST) -x *svn*
+ (cd $(srcdir)/newst_tiles && zip -ru0 $(abs_builddir)/$@
$(NEWST_TILESLIST) -x *svn*)
zip -T $@
install-data-local: $(AIVOLUTIONARCHIVE) $(GRIMARCHIVE) $(NEWST_TILESARCHIVE)
$(MKDIR_P) $(DESTDIR)$(pkgdatadir)/mods/global
- $(INSTALL_DATA) $(srcdir)/$(AIVOLUTIONARCHIVE)
$(DESTDIR)$(pkgdatadir)/mods/global/$(AIVOLUTIONARCHIVE)
- $(INSTALL_DATA) $(srcdir)/$(GRIMARCHIVE)
$(DESTDIR)$(pkgdatadir)/mods/global/$(GRIMARCHIVE)
- $(INSTALL_DATA) $(srcdir)/$(NEWST_TILESARCHIVE)
$(DESTDIR)$(pkgdatadir)/mods/global/$(NEWST_TILESARCHIVE)
+ $(INSTALL_DATA) $(AIVOLUTIONARCHIVE)
$(DESTDIR)$(pkgdatadir)/mods/global/$(AIVOLUTIONARCHIVE)
+ $(INSTALL_DATA) $(GRIMARCHIVE)
$(DESTDIR)$(pkgdatadir)/mods/global/$(GRIMARCHIVE)
+ $(INSTALL_DATA) $(NEWST_TILESARCHIVE)
$(DESTDIR)$(pkgdatadir)/mods/global/$(NEWST_TILESARCHIVE)
uninstall-local:
rm -f $(DESTDIR)$(pkgdatadir)/mods/global/$(AIVOLUTIONARCHIVE)
_______________________________________________
Warzone-dev mailing list
[email protected]
https://mail.gna.org/listinfo/warzone-dev
