diff options
| author | obache <obache> | 2009-12-28 10:49:23 +0000 |
|---|---|---|
| committer | obache <obache> | 2009-12-28 10:49:23 +0000 |
| commit | 8fcd9f0b22ce66dfe72d4bf110f182bc997f6b4c (patch) | |
| tree | 048d1b3b820fbdc25c71eeffa669225cf22afe33 /devel | |
| parent | 7181462549dc94b4fd8e569823ddb47f48293385 (diff) | |
| download | pkgsrc-8fcd9f0b22ce66dfe72d4bf110f182bc997f6b4c.tar.gz | |
Installation dirs should not contains PKGREVISION,
so use PKGNAME_NOREV instead of PKGNAME.
XXX: it may be sufficient to use just PKGBASE, but keep as-is.
XXX: and other than libFoundation are not using the subst line,
XXX: so maybe it should be moved to the package Makefile.
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/gnustep-make/gnustep.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk index 1337738abcc..8e3c0c1f620 100644 --- a/devel/gnustep-make/gnustep.mk +++ b/devel/gnustep-make/gnustep.mk @@ -1,4 +1,4 @@ -# $NetBSD: gnustep.mk,v 1.19 2009/10/08 12:49:27 joerg Exp $ +# $NetBSD: gnustep.mk,v 1.20 2009/12/28 10:49:23 obache Exp $ .if !defined(GNUSTEP_MK) GNUSTEP_MK= #defined @@ -46,7 +46,7 @@ SUBST_CLASSES+= gnustep_installation_dir SUBST_STAGE.gnustep_installation_dir= post-patch SUBST_FILES.gnustep_installation_dir?= GNUmakefile SUBST_SED.gnustep_installation_dir+= -e 's|GNUSTEP_INSTALLATION_DIR.*=.*..GNUSTEP_\(.*\)_ROOT.*|GNUSTEP_INSTALLATION_DOMAIN = \1|' -SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Libraries|$${DESTDIR}${GNUSTEP_LIB_DIR}/Libraries/${PKGNAME}|g' +SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Libraries|$${DESTDIR}${GNUSTEP_LIB_DIR}/Libraries/${PKGNAME_NOREV}|g' SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Library/Bundles|$${DESTDIR}${GNUSTEP_LIB_DIR}/Bundles|g' SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_INSTALLATION_DIR)/Library|$${DESTDIR}${GNUSTEP_ROOT}/${GNUSTEP_SUBDIR}/Library|g' SUBST_SED.gnustep_installation_dir+= -e 's|\$$(GNUSTEP_USER_ROOT)/Library|$${DESTDIR}${GNUSTEP_USER_ROOT}/${GNUSTEP_SUBDIR}/Library|g' |