diff options
| author | veego <veego> | 2001-06-16 08:53:48 +0000 |
|---|---|---|
| committer | veego <veego> | 2001-06-16 08:53:48 +0000 |
| commit | d32588f3f5d54ee0447201054d83e90262f8a62d (patch) | |
| tree | 6454f9aa4a8ec413e30a99fd7c55cd8a2fae473b /pkgtools/xpkgwedge | |
| parent | 3a14076f3bc237179a7b02ce9b5c2370545112cd (diff) | |
| download | pkgsrc-d32588f3f5d54ee0447201054d83e90262f8a62d.tar.gz | |
Add a local modified copy of InstallAppDefaultsLong:
This is the same as the one in X11.tmpl, but without the LinkConfDirectory.
LinkConfDirectory removes the app-defaults directory in $(PREFIX)/lib/X11
and creates a link to the real X11 app-defaults directory and moves the old
app-defaults files into it. This is not what we want for pkgsrc.
This is for the people who use the real XFree86 version and not the one from
xsrc/xfree which has a NetBSD specific hack which breaks sharing /usr/X11R6.
Bump to version 1.2.
Diffstat (limited to 'pkgtools/xpkgwedge')
| -rw-r--r-- | pkgtools/xpkgwedge/Makefile | 4 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/files/xpkgwedge.def | 21 |
2 files changed, 22 insertions, 3 deletions
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile index 397d28bfa0b..bf1dbb0fa9b 100644 --- a/pkgtools/xpkgwedge/Makefile +++ b/pkgtools/xpkgwedge/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.21 2001/05/31 10:25:21 dent Exp $ +# $NetBSD: Makefile,v 1.22 2001/06/16 08:53:48 veego Exp $ # -DISTNAME= xpkgwedge-1.1 +DISTNAME= xpkgwedge-1.2 CATEGORIES= pkgtools devel x11 MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/xpkgwedge/files/xpkgwedge.def b/pkgtools/xpkgwedge/files/xpkgwedge.def index d17e960fc67..c7e33e8a270 100644 --- a/pkgtools/xpkgwedge/files/xpkgwedge.def +++ b/pkgtools/xpkgwedge/files/xpkgwedge.def @@ -1,4 +1,4 @@ -/* $NetBSD: xpkgwedge.def,v 1.4 2000/12/31 14:17:09 jlam Exp $ */ +/* $NetBSD: xpkgwedge.def,v 1.5 2001/06/16 08:53:49 veego Exp $ */ #ifdef AfterVendorCF @@ -33,6 +33,25 @@ X11_ROOT = ProjectRoot */ #define X11ProjectRoot $(X11_ROOT) +/* + * InstallAppDefaultsLong - general rule to install application default file + * if the InstallAppDefFiles configuration parameter is set. + * + * This is the same as the one in X11.tmpl, but without the LinkConfDirectory. + * LinkConfDirectory removes the app-defaults directory in $(PREFIX)/lib/X11 + * and creates a link to the real X11 app-defaults directory and moves the old + * app-defaults files into it. This is not what we want for pkgsrc. + */ +#ifndef InstallAppDefaultsLong +#if InstallAppDefFiles +#define InstallAppDefaultsLong(file,class) @@\ +InstallNamedTarget(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) +#else +#define InstallAppDefaultsLong(file,class) @@\ +InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class) +#endif /* InstallAppDefFiles */ +#endif /* InstallAppDefaultsLong */ + #ifdef UseInstalled /* * We need to redefine ImakeCmd so that imake will look in |