- updated for 2.5.26

Changed files:
    fvwm2-paths.patch -> 1.6

diff --git a/fvwm2-paths.patch b/fvwm2-paths.patch
index 24566b042756743ea893ebf93357d82d1b7a69e7..cfa1dfbb75382ab03ffeb9f4c0ef6952cd2ca740 100644 (file)
--- a/fvwm2-paths.patch
+++ b/fvwm2-paths.patch
@@ -10,17 +10,17 @@ diff -urp fvwm-2.5.16.orig/configure.ac fvwm-2.5.16/configure.ac
  FVWM_DATASUBDIR=/${PACKAGE}
  
  AC_ARG_ENABLE(package-subdirs,
-@@ -81,8 +81,8 @@ AC_ARG_ENABLE(package-subdirs,
-   [if test x"$enableval" = xno; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR="";
+@@ -111,8 +111,8 @@ AC_ARG_ENABLE(package-subdirs,
    fi], [])
  
+ 
 -FVWM_MODULEDIR='${libexecdir}'"$FVWM_MODULESUBDIR"
 -FVWM_DATADIR='${datadir}'"$FVWM_DATASUBDIR"
 +FVWM_MODULEDIR='${libdir}'"$FVWM_MODULESUBDIR"
 +FVWM_DATADIR='${pkgdatadir}'
+ FVWM_DOCDIR='${datadir}'"$FVWM_DOCSUBDIR"
  FVWM_PERLLIBDIR='${datadir}'"$FVWM_DATASUBDIR/perllib"
- FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc
- 
+ FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc 
 Only in fvwm-2.5.16: fvwm2.menu.m4
 Only in fvwm-2.5.16: icons
 Only in fvwm-2.5.16: system.fvwm2rc