diff -rNu fvwm95-2.0.43f.orig/Makefile.in fvwm95-2.0.43f/Makefile.in --- fvwm95-2.0.43f.orig/Makefile.in 2014-04-12 15:07:09.112195143 +0200 +++ fvwm95-2.0.43f/Makefile.in 2014-04-12 15:29:20.530444173 +0200 @@ -8,7 +8,7 @@ @SET_MAKE@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ subdirs=libs fvwm modules utils sample.fvwmrc xpmroot pixmaps mini-icons docs diff -rNu fvwm95-2.0.43f.orig/docs/Makefile.in fvwm95-2.0.43f/docs/Makefile.in --- fvwm95-2.0.43f.orig/docs/Makefile.in 2014-04-12 15:07:09.113195104 +0200 +++ fvwm95-2.0.43f/docs/Makefile.in 2014-04-12 15:29:20.542443713 +0200 @@ -1,9 +1,9 @@ SHELL=/bin/sh -prefix=@prefix@ -indexdir=@prefix@/lib/X11/fvwm95 -htmldir=@prefix@/lib/X11/fvwm95/html +prefix=${DESTDIR}/@prefix@ +indexdir=${DESTDIR}/@prefix@/lib/X11/fvwm95 +htmldir=${DESTDIR}/@prefix@/lib/X11/fvwm95/html INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -rNu fvwm95-2.0.43f.orig/fvwm/Makefile.in fvwm95-2.0.43f/fvwm/Makefile.in --- fvwm95-2.0.43f.orig/fvwm/Makefile.in 2014-04-12 15:07:09.115195025 +0200 +++ fvwm95-2.0.43f/fvwm/Makefile.in 2014-04-12 15:29:20.559443062 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/libs/Makefile.in fvwm95-2.0.43f/libs/Makefile.in --- fvwm95-2.0.43f.orig/libs/Makefile.in 2014-04-12 15:07:09.385184347 +0200 +++ fvwm95-2.0.43f/libs/Makefile.in 2014-04-12 15:29:20.572442564 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ lib_dir=@exec_prefix@/lib x_includes=@x_includes@ diff -rNu fvwm95-2.0.43f.orig/mini-icons/Makefile.in fvwm95-2.0.43f/mini-icons/Makefile.in --- fvwm95-2.0.43f.orig/mini-icons/Makefile.in 2014-04-12 15:07:09.448181852 +0200 +++ fvwm95-2.0.43f/mini-icons/Makefile.in 2014-04-12 15:29:20.589441912 +0200 @@ -1,8 +1,8 @@ SHELL=/bin/sh -prefix=@prefix@ -icon_dir=@prefix@/lib/X11/mini-icons +prefix=${DESTDIR}/@prefix@ +icon_dir=${DESTDIR}/@prefix@/lib/X11/mini-icons INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -rNu fvwm95-2.0.43f.orig/modules/FvwmAudio/Makefile.in fvwm95-2.0.43f/modules/FvwmAudio/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmAudio/Makefile.in 2014-04-12 15:07:09.508179479 +0200 +++ fvwm95-2.0.43f/modules/FvwmAudio/Makefile.in 2014-04-12 15:29:20.602441415 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs X_LIBRARY=-lX11 @LIBS@ diff -rNu fvwm95-2.0.43f.orig/modules/FvwmAuto/Makefile.in fvwm95-2.0.43f/modules/FvwmAuto/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmAuto/Makefile.in 2014-04-12 15:07:09.508179479 +0200 +++ fvwm95-2.0.43f/modules/FvwmAuto/Makefile.in 2014-04-12 15:29:20.618440801 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmBacker/Makefile.in fvwm95-2.0.43f/modules/FvwmBacker/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmBacker/Makefile.in 2014-04-12 15:07:09.509179439 +0200 +++ fvwm95-2.0.43f/modules/FvwmBacker/Makefile.in 2014-04-12 15:29:20.632440265 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmBanner/Makefile.in fvwm95-2.0.43f/modules/FvwmBanner/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmBanner/Makefile.in 2014-04-12 15:07:09.509179439 +0200 +++ fvwm95-2.0.43f/modules/FvwmBanner/Makefile.in 2014-04-12 15:29:20.648439652 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ diff -rNu fvwm95-2.0.43f.orig/modules/FvwmButtons/Makefile.in fvwm95-2.0.43f/modules/FvwmButtons/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmButtons/Makefile.in 2014-04-12 15:07:09.510179400 +0200 +++ fvwm95-2.0.43f/modules/FvwmButtons/Makefile.in 2014-04-12 15:29:20.658439269 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmConsole/Makefile.in fvwm95-2.0.43f/modules/FvwmConsole/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmConsole/Makefile.in 2014-04-12 15:07:09.511179360 +0200 +++ fvwm95-2.0.43f/modules/FvwmConsole/Makefile.in 2014-04-12 15:29:20.668438886 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmCpp/Makefile.in fvwm95-2.0.43f/modules/FvwmCpp/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmCpp/Makefile.in 2014-04-12 15:07:09.512179321 +0200 +++ fvwm95-2.0.43f/modules/FvwmCpp/Makefile.in 2014-04-12 15:29:20.681438388 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmDebug/Makefile.in fvwm95-2.0.43f/modules/FvwmDebug/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmDebug/Makefile.in 2014-04-12 15:07:09.512179321 +0200 +++ fvwm95-2.0.43f/modules/FvwmDebug/Makefile.in 2014-04-12 15:29:20.693437928 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmForm/Makefile.in fvwm95-2.0.43f/modules/FvwmForm/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmForm/Makefile.in 2014-04-12 15:07:09.655173666 +0200 +++ fvwm95-2.0.43f/modules/FvwmForm/Makefile.in 2014-04-12 15:29:20.708437353 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIconBox/Makefile.in fvwm95-2.0.43f/modules/FvwmIconBox/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmIconBox/Makefile.in 2014-04-12 15:07:09.656173625 +0200 +++ fvwm95-2.0.43f/modules/FvwmIconBox/Makefile.in 2014-04-12 15:29:20.721436855 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIconMan/FvwmIconMan.c fvwm95-2.0.43f/modules/FvwmIconMan/FvwmIconMan.c --- fvwm95-2.0.43f.orig/modules/FvwmIconMan/FvwmIconMan.c 2014-04-12 15:07:09.657173585 +0200 +++ fvwm95-2.0.43f/modules/FvwmIconMan/FvwmIconMan.c 2014-04-12 15:52:32.429033840 +0200 @@ -320,11 +320,11 @@ int id = manager; \ if (id == -1) { \ for (id = 0; id < globals.num_managers; id++) { \ - globals.managers[id].##field = value; \ + globals.managers[id]. field = value; \ } \ } \ else if (id < globals.num_managers) { \ - globals.managers[id].##field = value; \ + globals.managers[id]. field = value; \ } \ else { \ ConsoleMessage ("Internal error in SET_MANAGER: %d\n", id); \ diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIconMan/Makefile.in fvwm95-2.0.43f/modules/FvwmIconMan/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmIconMan/Makefile.in 2014-04-12 15:07:09.658173545 +0200 +++ fvwm95-2.0.43f/modules/FvwmIconMan/Makefile.in 2014-04-12 15:29:20.733436396 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmIdent/Makefile.in fvwm95-2.0.43f/modules/FvwmIdent/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmIdent/Makefile.in 2014-04-12 15:07:09.659173505 +0200 +++ fvwm95-2.0.43f/modules/FvwmIdent/Makefile.in 2014-04-12 15:29:20.748435821 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmM4/Makefile.in fvwm95-2.0.43f/modules/FvwmM4/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmM4/Makefile.in 2014-04-12 15:07:09.659173505 +0200 +++ fvwm95-2.0.43f/modules/FvwmM4/Makefile.in 2014-04-12 15:29:20.761435323 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 PATH_DEFINES = -DFVWMDIR=\"${fvwm_dir}\" EXTRA_DEFINES=${PATH_DEFINES} -DXPM -DSHAPE diff -rNu fvwm95-2.0.43f.orig/modules/FvwmPager/Makefile.in fvwm95-2.0.43f/modules/FvwmPager/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmPager/Makefile.in 2014-04-12 15:07:09.659173505 +0200 +++ fvwm95-2.0.43f/modules/FvwmPager/Makefile.in 2014-04-12 15:29:20.778434671 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmSave/Makefile.in fvwm95-2.0.43f/modules/FvwmSave/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmSave/Makefile.in 2014-04-12 15:07:09.660173466 +0200 +++ fvwm95-2.0.43f/modules/FvwmSave/Makefile.in 2014-04-12 15:29:20.796433982 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmSaveDesk/Makefile.in fvwm95-2.0.43f/modules/FvwmSaveDesk/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmSaveDesk/Makefile.in 2014-04-12 15:07:09.660173466 +0200 +++ fvwm95-2.0.43f/modules/FvwmSaveDesk/Makefile.in 2014-04-12 15:29:20.811433407 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmScript/Makefile.in 2014-04-12 15:07:09.661173427 +0200 +++ fvwm95-2.0.43f/modules/FvwmScript/Makefile.in 2014-04-12 15:29:20.828432756 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Scripts/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/Makefile.in 2014-04-12 15:07:09.662173387 +0200 +++ fvwm95-2.0.43f/modules/FvwmScript/Scripts/Makefile.in 2014-04-12 15:29:20.846432066 +0200 @@ -1,8 +1,8 @@ SHELL=/bin/sh -prefix=@prefix@ -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ +prefix=${DESTDIR}/@prefix@ +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ INSTALL = @INSTALL@ diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in 2014-04-12 15:07:09.663173347 +0200 +++ fvwm95-2.0.43f/modules/FvwmScript/Scripts/some_nice_icons/Makefile.in 2014-04-12 15:29:20.860431530 +0200 @@ -1,8 +1,8 @@ SHELL=/bin/sh -prefix=@prefix@ -icon_dir=@prefix@/lib/X11/icons +prefix=${DESTDIR}/@prefix@ +icon_dir=${DESTDIR}/@prefix@/lib/X11/icons INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScript/Widgets/Makefile.in fvwm95-2.0.43f/modules/FvwmScript/Widgets/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmScript/Widgets/Makefile.in 2014-04-12 15:07:09.665173268 +0200 +++ fvwm95-2.0.43f/modules/FvwmScript/Widgets/Makefile.in 2014-04-12 15:29:20.872431070 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ lib_dir=@exec_prefix@/lib x_includes=@x_includes@ diff -rNu fvwm95-2.0.43f.orig/modules/FvwmScroll/Makefile.in fvwm95-2.0.43f/modules/FvwmScroll/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmScroll/Makefile.in 2014-04-12 15:07:09.667173189 +0200 +++ fvwm95-2.0.43f/modules/FvwmScroll/Makefile.in 2014-04-12 15:29:20.882430687 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmTalk/Makefile.in fvwm95-2.0.43f/modules/FvwmTalk/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmTalk/Makefile.in 2014-04-12 15:07:09.667173189 +0200 +++ fvwm95-2.0.43f/modules/FvwmTalk/Makefile.in 2014-04-12 15:29:20.899430036 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmTaskBar/BatStatModule.c fvwm95-2.0.43f/modules/FvwmTaskBar/BatStatModule.c --- fvwm95-2.0.43f.orig/modules/FvwmTaskBar/BatStatModule.c 2014-04-12 15:07:09.667173189 +0200 +++ fvwm95-2.0.43f/modules/FvwmTaskBar/BatStatModule.c 2014-04-12 15:59:36.189492766 +0200 @@ -229,7 +229,7 @@ #endif mif = NULL; - (void *) mif = calloc(1, sizeof(BatStatInfo_t)); + mif = (BatStatInfo_t *)calloc(1, sizeof(BatStatInfo_t)); if(mif == NULL) { perror("FvwmTaskBar. BatStatModule.Init()"); return NULL; diff -rNu fvwm95-2.0.43f.orig/modules/FvwmTaskBar/Makefile.in fvwm95-2.0.43f/modules/FvwmTaskBar/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmTaskBar/Makefile.in 2014-04-12 15:07:09.669173110 +0200 +++ fvwm95-2.0.43f/modules/FvwmTaskBar/Makefile.in 2014-04-12 15:29:20.912429538 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmWharf/Makefile.in fvwm95-2.0.43f/modules/FvwmWharf/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmWharf/Makefile.in 2014-04-12 15:07:09.671173031 +0200 +++ fvwm95-2.0.43f/modules/FvwmWharf/Makefile.in 2014-04-12 15:29:20.922429155 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/FvwmWinList/Makefile.in fvwm95-2.0.43f/modules/FvwmWinList/Makefile.in --- fvwm95-2.0.43f.orig/modules/FvwmWinList/Makefile.in 2014-04-12 15:07:09.673172952 +0200 +++ fvwm95-2.0.43f/modules/FvwmWinList/Makefile.in 2014-04-12 15:29:20.938428542 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ @@ -15,8 +15,8 @@ fvwm_name=@fvwm_name@ # # This is where the modules will be installed -fvwm_dir=@prefix@/lib/X11/@fvwm_name@ -man_dir=@prefix@/man/man1 +fvwm_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ +man_dir=${DESTDIR}/@prefix@/man/man1 # # Libs diff -rNu fvwm95-2.0.43f.orig/modules/Makefile.in fvwm95-2.0.43f/modules/Makefile.in --- fvwm95-2.0.43f.orig/modules/Makefile.in 2014-04-12 15:07:09.673172952 +0200 +++ fvwm95-2.0.43f/modules/Makefile.in 2014-04-12 15:29:20.948428159 +0200 @@ -3,13 +3,13 @@ @SET_MAKE@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ subdirs=FvwmAudio FvwmAuto FvwmBacker FvwmBanner FvwmButtons FvwmConsole \ FvwmCpp FvwmDebug FvwmForm FvwmIconBox FvwmIconMan FvwmIdent FvwmM4 \ FvwmPager FvwmSave FvwmSaveDesk FvwmScript FvwmScroll FvwmTalk \ FvwmTaskBar FvwmWinList FvwmWharf -modules_dir=@prefix@/lib/X11/@fvwm_name@ +modules_dir=${DESTDIR}/@prefix@/lib/X11/@fvwm_name@ all: @for i in ${subdirs}; do \ diff -rNu fvwm95-2.0.43f.orig/pixmaps/Makefile.in fvwm95-2.0.43f/pixmaps/Makefile.in --- fvwm95-2.0.43f.orig/pixmaps/Makefile.in 2014-04-12 15:07:09.674172912 +0200 +++ fvwm95-2.0.43f/pixmaps/Makefile.in 2014-04-12 15:29:20.967427431 +0200 @@ -1,8 +1,8 @@ SHELL=/bin/sh -prefix=@prefix@ -pixmaps_dir=@prefix@/lib/X11/pixmaps +prefix=${DESTDIR}/@prefix@ +pixmaps_dir=${DESTDIR}/@prefix@/lib/X11/pixmaps INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ diff -rNu fvwm95-2.0.43f.orig/sample.fvwmrc/Makefile.in fvwm95-2.0.43f/sample.fvwmrc/Makefile.in --- fvwm95-2.0.43f.orig/sample.fvwmrc/Makefile.in 2014-04-12 15:07:09.692172200 +0200 +++ fvwm95-2.0.43f/sample.fvwmrc/Makefile.in 2014-04-12 15:29:20.981426894 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin fvwm_rc=@fvwm_rc@ diff -rNu fvwm95-2.0.43f.orig/utils/Makefile.in fvwm95-2.0.43f/utils/Makefile.in --- fvwm95-2.0.43f.orig/utils/Makefile.in 2014-04-12 15:07:09.693172161 +0200 +++ fvwm95-2.0.43f/utils/Makefile.in 2014-04-12 15:29:20.998426243 +0200 @@ -5,7 +5,7 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin fvwm_name=@fvwm_name@ diff -rNu fvwm95-2.0.43f.orig/xpmroot/Makefile.in fvwm95-2.0.43f/xpmroot/Makefile.in --- fvwm95-2.0.43f.orig/xpmroot/Makefile.in 2014-04-12 15:07:09.694172121 +0200 +++ fvwm95-2.0.43f/xpmroot/Makefile.in 2014-04-12 15:29:21.011425745 +0200 @@ -5,13 +5,13 @@ top_srcdir=@top_srcdir@ srcdir=@srcdir@ -prefix=@prefix@ +prefix=${DESTDIR}/@prefix@ exec_prefix=@exec_prefix@ bin_dir=@exec_prefix@/bin x_includes=@x_includes@ x_libraries=@x_libraries@ -man_dir=@prefix@/man/man1 +man_dir=${DESTDIR}/@prefix@/man/man1 XPM_LIBRARY=-lXpm X_LIBRARY=-lX11 @LIBS@