diff options
| author | jlam <jlam> | 2004-01-03 23:34:19 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-01-03 23:34:19 +0000 |
| commit | a1fc77ae0362ff75c8136fdc020d37b8b8c48f6c (patch) | |
| tree | b30fec5a6249cf429c9ff271b6edd498f91c8183 /pkgtools/xpkgwedge/files | |
| parent | 7f3bc0f329bc6dfe3bb4ac994edf7f72da0b2c73 (diff) | |
| download | pkgsrc-a1fc77ae0362ff75c8136fdc020d37b8b8c48f6c.tar.gz | |
Update pkgtools/xpkgwedge to 1.9. Changes from version 1.8 are making
this package work in a pkgviews world by looking for imake config files
in ${PREFIX}/lib/X11/config, then ${VIEWBASE}/lib/X11/config, then
${X11BASE}/lib/X11/config. The second directory is where some packages
may share a commonly-editted host.def file.
Diffstat (limited to 'pkgtools/xpkgwedge/files')
| -rw-r--r-- | pkgtools/xpkgwedge/files/pkgxmkmf.in | 6 | ||||
| -rw-r--r-- | pkgtools/xpkgwedge/files/xpkgwedge.def | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/pkgtools/xpkgwedge/files/pkgxmkmf.in b/pkgtools/xpkgwedge/files/pkgxmkmf.in index b9202355f9a..9a7da82aeb1 100644 --- a/pkgtools/xpkgwedge/files/pkgxmkmf.in +++ b/pkgtools/xpkgwedge/files/pkgxmkmf.in @@ -3,7 +3,7 @@ # XFree86 Id: xc/config/util/xmkmf.cpp,v 1.3 2000/11/16 21:57:10 dawes Exp # XConsortium Id: xmkmf.cpp /main/22 1996/09/28 16:17:05 rws # -# $NetBSD: pkgxmkmf.in,v 1.3 2003/06/12 15:34:39 jschauma Exp $ +# $NetBSD: pkgxmkmf.in,v 1.4 2004/01/03 23:34:21 jlam Exp $ # # make a Makefile from an Imakefile from inside or outside the sources # with support for config files in ${PREFIX}/lib/X11/config @@ -12,10 +12,14 @@ usage="usage: $0 [-a] [top_of_sources_pathname [current_directory]]" xcfgdir=@X11BASE@/lib/X11/config lcfgdir=@PREFIX@/lib/X11/config +vcfgdir=@VIEWBASE@/lib/X11/config configdirspec='' if [ "${xcfgdir}" != "${lcfgdir}" -a -d ${lcfgdir} ]; then configdirspec="${configdirspec} -I${lcfgdir}" fi +if [ "${lcfgdir}" != "${vcfgdir}" -a -d ${vcfgdir} ]; then + configdirspec="${configdirspec} -I${vcfgdir}" +fi configdirspec="${configdirspec} -I${xcfgdir}" topdir= diff --git a/pkgtools/xpkgwedge/files/xpkgwedge.def b/pkgtools/xpkgwedge/files/xpkgwedge.def index 071082d3f3a..1dcb47b5b82 100644 --- a/pkgtools/xpkgwedge/files/xpkgwedge.def +++ b/pkgtools/xpkgwedge/files/xpkgwedge.def @@ -1,4 +1,4 @@ -/* $NetBSD: xpkgwedge.def,v 1.9 2003/09/10 17:31:44 gavan Exp $ */ +/* $NetBSD: xpkgwedge.def,v 1.10 2004/01/03 23:34:21 jlam Exp $ */ #ifdef AfterVendorCF @@ -50,13 +50,13 @@ InstallNamedTargetNoClobber(install,file.ad,$(INSTAPPFLAGS),$(XAPPLOADDIR),class #ifdef UseInstalled /* - * We need to redefine ImakeCmd so that imake will look in - * $(PREFIX)/lib/X11/config *before* looking in the standard X - * config directory to override any configuration files installed - * there. + * We need to redefine ImakeCmd so that imake will look in both + * $(PREFIX)/lib/X11/config and $(VIEWBASE)/lib/X11/config *before* + * looking in the standard X11 config directory to override any + * configuration files installed there. */ #undef ImakeCmd -#define ImakeCmd imake -I$(PREFIX)/lib/X11/config +#define ImakeCmd imake -I$(PREFIX)/lib/X11/config -I$(VIEWBASE)/lib/X11/config #endif #endif /* AfterVendorCF */ |