- 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 2d0371277f0754654079711fb583b613446640db..cfa1dfbb75382ab03ffeb9f4c0ef6952cd2ca740 100644 (file)
--- a/fvwm2-paths.patch
+++ b/fvwm2-paths.patch
@@ -1,19 +1,26 @@
---- fvwm-2.2/extras/FvwmConsole/FvwmConsoleC.pl.redhat Fri Nov 13 14:36:14 1998
-+++ fvwm-2.2/extras/FvwmConsole/FvwmConsoleC.pl        Mon Mar 22 17:32:38 1999
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl
- #    $0 - Front end of FvwmConsole
- #    FvwmConsole server must be running
- 
---- fvwm-2.2/configure.in.redhat       Mon Feb 22 11:25:48 1999
-+++ fvwm-2.2/configure.in      Mon Mar 22 17:32:38 1999
-@@ -5,7 +5,7 @@
- AM_INIT_AUTOMAKE(fvwm, 2.2)
+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)
  
--FVWM_MODULEDIR='${libexecdir}/${PACKAGE}/${VERSION}'
-+FVWM_MODULEDIR='${libexecdir}'
- FVWM_CONFIGDIR='${sysconfdir}'
+ # installation paths
+-FVWM_MODULESUBDIR=/${PACKAGE}/${VERSION}
++FVWM_MODULESUBDIR=/${PACKAGE}
+ FVWM_DATASUBDIR=/${PACKAGE}
+ 
+ AC_ARG_ENABLE(package-subdirs,
+@@ -111,8 +111,8 @@ AC_ARG_ENABLE(package-subdirs,
+   fi], [])
+ 
  
- 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