Fix default paths in WPrefs.app.

Submitted by:	Brian Handy <handy@physics.montana.edu>
This commit is contained in:
Thomas Gellekum 1998-10-19 10:57:04 +00:00
parent 7e06d817b3
commit 7a58dbefbb
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=14063
4 changed files with 60 additions and 2 deletions

View File

@ -3,7 +3,7 @@
# Date created: August 13, 1997
# Whom: handy@physics.montana.edu
#
# $Id: Makefile,v 1.33 1998/09/27 20:59:11 steve Exp $
# $Id: Makefile,v 1.34 1998/09/30 13:24:39 tg Exp $
DISTNAME= WindowMaker-0.20.1
PKGNAME= windowmaker-0.20.1
@ -38,6 +38,9 @@ DATAFILES= WindowMaker-data.tar.gz
post-extract:
cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} libPropList.tar.gz
post-patch:
@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
pre-configure:
@(cd ${WRKSRC}/libPropList && CC="${CC}" CXX="${CXX}" \
ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \

View File

@ -0,0 +1,26 @@
--- WPrefs.app/Paths.c.orig Fri Oct 9 07:35:39 1998
+++ WPrefs.app/Paths.c Fri Oct 9 07:37:46 1998
@@ -82,10 +82,10 @@
wwarning(_("bad value in option IconPath. Using default path list"));
addPathToList(panel->icoL, -1, "~/pixmaps");
addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
- addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Pixmaps");
- addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
+ addPathToList(panel->icoL, -1, "%%PREFIX%%/include/X11/pixmaps");
+ addPathToList(panel->icoL, -1, "%%PREFIX%%/share/WindowMaker/Icons");
+ addPathToList(panel->icoL, -1, "%%PREFIX%%/share/WindowMaker/Pixmaps");
+ addPathToList(panel->icoL, -1, "%%PREFIX%%/share/WindowMaker/Icons");
} else {
for (i=0; i<PLGetNumberOfElements(array); i++) {
val = PLGetArrayElement(array, i);
@@ -99,7 +99,7 @@
wwarning(_("bad value in option PixmapPath. Using default path list"));
addPathToList(panel->pixL, -1, "~/pixmaps");
addPathToList(panel->pixL, -1, "~/GNUstep/Library/WindowMaker/Pixmaps");
- addPathToList(panel->pixL, -1, "/usr/local/share/WindowMaker/Pixmaps");
+ addPathToList(panel->pixL, -1, "%%PREFIX%%/share/WindowMaker/Pixmaps");
} else {
for (i=0; i<PLGetNumberOfElements(array); i++) {
val = PLGetArrayElement(array, i);

View File

@ -3,7 +3,7 @@
# Date created: August 13, 1997
# Whom: handy@physics.montana.edu
#
# $Id: Makefile,v 1.33 1998/09/27 20:59:11 steve Exp $
# $Id: Makefile,v 1.34 1998/09/30 13:24:39 tg Exp $
DISTNAME= WindowMaker-0.20.1
PKGNAME= windowmaker-0.20.1
@ -38,6 +38,9 @@ DATAFILES= WindowMaker-data.tar.gz
post-extract:
cd ${WRKSRC}; ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} libPropList.tar.gz
post-patch:
@perl -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c
pre-configure:
@(cd ${WRKSRC}/libPropList && CC="${CC}" CXX="${CXX}" \
ac_cv_path_CC="${CC}" CFLAGS="${CFLAGS} -fPIC" \

View File

@ -0,0 +1,26 @@
--- WPrefs.app/Paths.c.orig Fri Oct 9 07:35:39 1998
+++ WPrefs.app/Paths.c Fri Oct 9 07:37:46 1998
@@ -82,10 +82,10 @@
wwarning(_("bad value in option IconPath. Using default path list"));
addPathToList(panel->icoL, -1, "~/pixmaps");
addPathToList(panel->icoL, -1, "~/GNUstep/Library/Icons");
- addPathToList(panel->icoL, -1, "/usr/include/X11/pixmaps");
- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Icons");
- addPathToList(panel->icoL, -1, "/usr/local/share/WindowMaker/Pixmaps");
- addPathToList(panel->icoL, -1, "/usr/share/WindowMaker/Icons");
+ addPathToList(panel->icoL, -1, "%%PREFIX%%/include/X11/pixmaps");
+ addPathToList(panel->icoL, -1, "%%PREFIX%%/share/WindowMaker/Icons");
+ addPathToList(panel->icoL, -1, "%%PREFIX%%/share/WindowMaker/Pixmaps");
+ addPathToList(panel->icoL, -1, "%%PREFIX%%/share/WindowMaker/Icons");
} else {
for (i=0; i<PLGetNumberOfElements(array); i++) {
val = PLGetArrayElement(array, i);
@@ -99,7 +99,7 @@
wwarning(_("bad value in option PixmapPath. Using default path list"));
addPathToList(panel->pixL, -1, "~/pixmaps");
addPathToList(panel->pixL, -1, "~/GNUstep/Library/WindowMaker/Pixmaps");
- addPathToList(panel->pixL, -1, "/usr/local/share/WindowMaker/Pixmaps");
+ addPathToList(panel->pixL, -1, "%%PREFIX%%/share/WindowMaker/Pixmaps");
} else {
for (i=0; i<PLGetNumberOfElements(array); i++) {
val = PLGetArrayElement(array, i);