- 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 9559e46f171c129eeb719f90cde004c3837bd8c6..cfa1dfbb75382ab03ffeb9f4c0ef6952cd2ca740 100644 (file)
--- a/fvwm2-paths.patch
+++ b/fvwm2-paths.patch
@@ -1,22 +1,26 @@
---- fvwm-2.4.0/configure.in.orig       Tue Jul  3 09:58:15 2001
-+++ fvwm-2.4.0/configure.in    Mon Aug 20 03:34:00 2001
-@@ -5,7 +5,7 @@
- AM_INIT_AUTOMAKE(fvwm, 2.4.0)
+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)
  
+ # installation paths
 -FVWM_MODULESUBDIR=/${PACKAGE}/${VERSION}
 +FVWM_MODULESUBDIR=/${PACKAGE}
  FVWM_DATASUBDIR=/${PACKAGE}
  
  AC_ARG_ENABLE(package-subdirs,
-@@ -13,8 +13,8 @@
-   [if test $enableval = no; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR=""; fi],
-   [])
+@@ -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_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc
  
- AC_SUBST(FVWM_MODULEDIR)
+-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 
+Only in fvwm-2.5.16: fvwm2.menu.m4
+Only in fvwm-2.5.16: icons
+Only in fvwm-2.5.16: system.fvwm2rc