diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2005-10-24 14:25:27 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2005-10-24 14:25:27 +0000 |
| commit | 8da0e27a140ecf69c2820fa56a293231f247361d (patch) | |
| tree | dc514332067e075b4b6d4838b13b4a8f0a5e79cb /x11-wm/fvwm/files | |
| parent | - make prefix safe (diff) | |
- make portlint happier
- honor PREFIX in defaults and sample.fvwmrc
Notes
Notes:
svn path=/head/; revision=146255
Diffstat (limited to 'x11-wm/fvwm/files')
| -rw-r--r-- | x11-wm/fvwm/files/patch-ab | 10 | ||||
| -rw-r--r-- | x11-wm/fvwm/files/patch-ac | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/x11-wm/fvwm/files/patch-ab b/x11-wm/fvwm/files/patch-ab index 0b2e7c2fda37..6fd353db208d 100644 --- a/x11-wm/fvwm/files/patch-ab +++ b/x11-wm/fvwm/files/patch-ab @@ -10,10 +10,10 @@ /* Imake command needed to put modules in desired target location */ /* Use the second version if it causes grief */ --- 1,7 ---- -! #define FVWMDIR "/usr/X11R6/lib/X11/fvwm" +! #define FVWMDIR "%%PREFIX%%/lib/X11/fvwm" /* #define FVWMDIR "/local/homes/dsp/nation/modules"*/ -! #define FVWM_ICONDIR "/usr/X11R6/include/X11/bitmaps:/usr/X11R6/include/X11/pixmaps" -! #define FVWMRC "/usr/X11R6/lib/X11/fvwm/system.fvwmrc" +! #define FVWM_ICONDIR "%%PREFIX%%/include/X11/bitmaps:%%PREFIX%%/include/X11/pixmaps" +! #define FVWMRC "%%PREFIX%%/lib/X11/fvwm/system.fvwmrc" /* Imake command needed to put modules in desired target location */ /* Use the second version if it causes grief */ @@ -36,7 +36,7 @@ * If you want to install it in a different directory, uncomment and * edit the first line */ /* #define FVWM_BIN_DIR BINDIR=/local/homes/dsp/nation/bin/4.1.3*/ -! #define FVWM_BIN_DIR BINDIR=/usr/X11R6/bin +! #define FVWM_BIN_DIR BINDIR=%%PREFIX%%/bin /*#define FVWM_BIN_DIR*/ /* Compiler over-ride for Imakefiles */ @@ -48,7 +48,7 @@ /*************************************************************************** *************** *** 69,82 **** - * undefine(`include') to fix that one. Some version of m4 + * undefine(`include') tofix that one. Some version of m4 * seem to give good error messages, others don't? ***************************************************************************/ ! /* #define M4 */ diff --git a/x11-wm/fvwm/files/patch-ac b/x11-wm/fvwm/files/patch-ac index 889fb6b66b0d..ac93128be13e 100644 --- a/x11-wm/fvwm/files/patch-ac +++ b/x11-wm/fvwm/files/patch-ac @@ -27,9 +27,9 @@ -ModulePath /usr/lib/X11/fvwm -PixmapPath /usr/include/X11/pixmaps/ -IconPath /usr/include/X11/bitmaps/ -+ModulePath /usr/X11R6/lib/X11/fvwm -+PixmapPath /usr/X11R6/include/X11/pixmaps/ -+IconPath /usr/X11R6/include/X11/bitmaps/ ++ModulePath %%PREFIX%%/lib/X11/fvwm ++PixmapPath %%PREFIX%%/include/X11/pixmaps/ ++IconPath %%PREFIX%%/include/X11/bitmaps/ ############################################################################ # Set the decoration styles and window options @@ -38,7 +38,7 @@ Function "InitFunction" Module "I" FvwmBanner - Exec "I" xpmroot /usr/include/X11/pixmaps/fvwm.xpm & -+ Exec "I" xpmroot /usr/X11R6/include/X11/pixmaps/fvwm.xpm & ++ Exec "I" xpmroot %%PREFIX%%/include/X11/pixmaps/fvwm.xpm & Module "I" GoodStuff Exec "I" exec xterm -geometry 80x64+0+0 & Wait "I" xterm |