diff options
| author | nia <nia@pkgsrc.org> | 2020-05-21 11:14:29 +0000 |
|---|---|---|
| committer | nia <nia@pkgsrc.org> | 2020-05-21 11:14:29 +0000 |
| commit | e806f30548250bd2f180002bdfa3c6094ea02574 (patch) | |
| tree | e326be6bcf6076538b79ae1a137dc9725832feda | |
| parent | 4507040df8d957cbcfa5bbcec945379372c9974e (diff) | |
| download | pkgsrc-e806f30548250bd2f180002bdfa3c6094ea02574.tar.gz | |
freeciv: sprinkle SUBST_NOOP_OK
being extremely unopinionated about whether autoconf files are pregenerated
or not, especially when the subst is transcluded
| -rw-r--r-- | games/freeciv-client/Makefile | 4 | ||||
| -rw-r--r-- | games/freeciv-share/suppress_installation.mk | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/games/freeciv-client/Makefile b/games/freeciv-client/Makefile index e750a685940..8a649c8268c 100644 --- a/games/freeciv-client/Makefile +++ b/games/freeciv-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.110 2020/05/06 14:04:32 adam Exp $ +# $NetBSD: Makefile,v 1.111 2020/05/21 11:14:29 nia Exp $ PKGNAME= ${DISTNAME:S/-/-client-/} PKGREVISION= 1 @@ -20,6 +20,7 @@ SUBST_SED.themesonly+= -e 's|SUBDIRS = icons.*|SUBDIRS = themes|' SUBST_SED.themesonly+= -e 's|^ isotrident trident|DONT_SUBDIRS =|' SUBST_SED.themesonly+= -e 's|install-data-am: install-data-local|install-data-am: \# install-data-local|' SUBST_MESSAGE.themesonly= Suppressing installation of non-gui-relevant data +SUBST_NOOP_OK.themesonly= yes SUBST_CLASSES+= themesonly2 SUBST_STAGE.themesonly2= post-configure @@ -27,6 +28,7 @@ SUBST_FILES.themesonly2= data/Makefile SUBST_SED.themesonly2+= -e 's|SUBDIRS = icons.*|SUBDIRS = themes|' SUBST_SED.themesonly2+= -e 's|^ isotrident trident|DONT_SUBDIRS =|' SUBST_MESSAGE.themesonly2= Suppressing installation of non-gui-relevant data +SUBST_NOOP_OK.themesonly2= yes # conflicts with freeciv-share post-install: diff --git a/games/freeciv-share/suppress_installation.mk b/games/freeciv-share/suppress_installation.mk index bd34bb46b61..8aa99a756d6 100644 --- a/games/freeciv-share/suppress_installation.mk +++ b/games/freeciv-share/suppress_installation.mk @@ -1,4 +1,4 @@ -# $NetBSD: suppress_installation.mk,v 1.4 2016/04/24 06:52:44 prlw1 Exp $ +# $NetBSD: suppress_installation.mk,v 1.5 2020/05/21 11:14:29 nia Exp $ # Makefile snippet to be included by freeciv-client and freeciv-server to # prevent files installed by freeciv-share from being installed again. @@ -28,15 +28,18 @@ SUBST_STAGE.installmanfix3= post-configure SUBST_FILES.installmanfix3= Makefile SUBST_SED.installmanfix3+= -e 's|translations doc ||g' SUBST_MESSAGE.installmanfix3= Suppressing installation of man pages and localization files already in freeciv-share. +SUBST_NOOP_OK.installmanfix3= yes SUBST_CLASSES+= installmanfix4 SUBST_STAGE.installmanfix4= post-configure SUBST_FILES.installmanfix4= Makefile SUBST_SED.installmanfix4+= -e 's|install-data-am: install-docDATA|install-data-am: \# install-docDATA|' SUBST_MESSAGE.installmanfix4= Suppressing installation of doc files already in freeciv-share +SUBST_NOOP_OK.installmanfix4= yes SUBST_CLASSES+= installfix2 SUBST_STAGE.installfix2= post-configure SUBST_FILES.installfix2= common/Makefile SUBST_SED.installfix2+= -e 's|^install-exec-am: install-libLTLIBRARIES|install-exec-am: \# install-libLTLIBRARIES|' SUBST_MESSAGE.installfix2= Suppressing installation of libs already in freeciv-share. +SUBST_NOOP_OK.installfix2= yes |