- drop obsolete and outdated manual inclusion of rpm macros

[packages/fvwm2.git] / fvwm2-paths.patch

diff --git a/fvwm2-paths.patch b/fvwm2-paths.patch
index ff96b9d94ed086332b0cd73b44417c190a9e1597..cfa1dfbb75382ab03ffeb9f4c0ef6952cd2ca740 100644 (file)
--- a/fvwm2-paths.patch
+++ b/fvwm2-paths.patch
@@ -1,23 +1,26 @@
-diff -urN fvwm-2.5.12.vanilla/configure.in fvwm-2.5.12/configure.in
---- fvwm-2.5.12.vanilla/configure.in   2004-10-06 02:42:02.000000000 +0200
-+++ fvwm-2.5.12/configure.in   2005-02-21 21:46:00.825000040 +0100
-@@ -72,7 +72,7 @@
+diff -urp fvwm-2.5.16.orig/configure.ac fvwm-2.5.16/configure.ac
+--- fvwm-2.5.16.orig/configure.ac      2006-01-20 10:17:13.000000000 +0100
++++ fvwm-2.5.16/configure.ac   2006-04-14 03:10:34.000000000 +0200
+@@ -73,7 +73,7 @@ AM_INIT_AUTOMAKE(fvwm, ${version})
  AM_CONFIG_HEADER(config.h)
  
- dnl installation paths
+ # installation paths
 -FVWM_MODULESUBDIR=/${PACKAGE}/${VERSION}
 +FVWM_MODULESUBDIR=/${PACKAGE}
  FVWM_DATASUBDIR=/${PACKAGE}
  
  AC_ARG_ENABLE(package-subdirs,
-@@ -80,8 +80,8 @@
-   [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