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

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 @@
 AM_CONFIG_HEADER(config.h)
 
 dnl 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="";
   fi], [])
 
-FVWM_MODULEDIR='${libexecdir}'"$FVWM_MODULESUBDIR"
-FVWM_DATADIR='${datadir}'"$FVWM_DATASUBDIR"
+FVWM_MODULEDIR='${libdir}'"$FVWM_MODULESUBDIR"
+FVWM_DATADIR='${pkgdatadir}'
 FVWM_PERLLIBDIR='${datadir}'"$FVWM_DATASUBDIR/perllib"
 FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc
Commit	Line	Data
5d710efc	1	diff -urN fvwm-2.5.12.vanilla/configure.in fvwm-2.5.12/configure.in
	2	--- fvwm-2.5.12.vanilla/configure.in 2004-10-06 02:42:02.000000000 +0200
	3	+++ fvwm-2.5.12/configure.in 2005-02-21 21:46:00.825000040 +0100
	4	@@ -72,7 +72,7 @@
9274efa4 JR	5	AM_CONFIG_HEADER(config.h)
9274efa4 JR	6
b8115d7b	7	dnl installation paths
7e9cec17	8	-FVWM_MODULESUBDIR=/${PACKAGE}/${VERSION}
	9	+FVWM_MODULESUBDIR=/${PACKAGE}
	10	FVWM_DATASUBDIR=/${PACKAGE}
	11
	12	AC_ARG_ENABLE(package-subdirs,
5d710efc	13	@@ -80,8 +80,8 @@
b8115d7b JB	14	[if test x"$enableval" = xno; then FVWM_MODULESUBDIR=""; FVWM_DATASUBDIR="";
b8115d7b JB	15	fi], [])
7e9cec17	16
b8115d7b JB	17	-FVWM_MODULEDIR='${libexecdir}'"$FVWM_MODULESUBDIR"
	18	-FVWM_DATADIR='${datadir}'"$FVWM_DATASUBDIR"
	19	+FVWM_MODULEDIR='${libdir}'"$FVWM_MODULESUBDIR"
7e9cec17	20	+FVWM_DATADIR='${pkgdatadir}'
b8115d7b	21	FVWM_PERLLIBDIR='${datadir}'"$FVWM_DATASUBDIR/perllib"
7e9cec17	22	FVWM_CONFDIR='${sysconfdir}'dnl used _only_ to search for system.fvwm2rc
9274efa4	23