diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 1997-06-13 17:29:53 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 1997-06-13 17:29:53 +0000 |
| commit | 793c74123dabacea56fdbb88447a3f54e9bb9032 (patch) | |
| tree | 32f4bfca9ccd93ef22f07af6d5229e48b62a3338 /x11-wm/fvwm95/files/patch-aa | |
| parent | Define MANLANG, MAN1 and MANCOMPRESSED. (diff) | |
Since this port depends on rplay library, enable builtin rplay support
Diffstat (limited to 'x11-wm/fvwm95/files/patch-aa')
| -rw-r--r-- | x11-wm/fvwm95/files/patch-aa | 63 |
1 files changed, 38 insertions, 25 deletions
diff --git a/x11-wm/fvwm95/files/patch-aa b/x11-wm/fvwm95/files/patch-aa index a4df0f298e31..19ade04157e5 100644 --- a/x11-wm/fvwm95/files/patch-aa +++ b/x11-wm/fvwm95/files/patch-aa @@ -1,25 +1,38 @@ ---- modules/FvwmAudio/Makefile.in.orig Sat Feb 1 13:23:37 1997 -+++ modules/FvwmAudio/Makefile.in Sat Feb 1 13:23:23 1997 -@@ -10,6 +10,8 @@ - bin_dir=@exec_prefix@/bin - x_includes=@x_includes@ - x_libraries=@x_libraries@ -+libdir=@libdir@ -+includedir=@includedir@ - fvwm_icons=@fvwm_icons@ - fvwm_rc=@fvwm_rc@ - fvwm_name=@fvwm_name@ -@@ -24,11 +26,11 @@ - XEXT_LIBRARY=-lXext - FVWM_LIBRARY=-l${fvwm_name} - RPLAY_LIBRARY=-lrplay --LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} ${RPLAY_LIBRARY} -+LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} ${RPLAY_LIBRARY} - - EXTRA_DEFINES=-DXPM -DSHAPE - CC=@CC@ --INCLUDES=-I${top_srcdir}/include ${x_includes} -+INCLUDES=-I${top_srcdir}/include ${x_includes} ${includedir} - CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} - MAKEDEPEND=@MAKEDEPEND@ - INSTALL=@INSTALL@ +*** modules/FvwmAudio/Makefile.in.orig Tue Sep 10 22:25:33 1996 +--- modules/FvwmAudio/Makefile.in Fri Jun 13 21:11:07 1997 +*************** +*** 10,15 **** +--- 10,17 ---- + bin_dir=@exec_prefix@/bin + x_includes=@x_includes@ + x_libraries=@x_libraries@ ++ libdir=@libdir@ ++ includedir=@includedir@ + fvwm_icons=@fvwm_icons@ + fvwm_rc=@fvwm_rc@ + fvwm_name=@fvwm_name@ +*************** +*** 24,34 **** + XEXT_LIBRARY=-lXext + FVWM_LIBRARY=-l${fvwm_name} + RPLAY_LIBRARY=-lrplay +! LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} ${RPLAY_LIBRARY} + +! EXTRA_DEFINES=-DXPM -DSHAPE + CC=@CC@ +! INCLUDES=-I${top_srcdir}/include ${x_includes} + CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} + MAKEDEPEND=@MAKEDEPEND@ + INSTALL=@INSTALL@ +--- 26,36 ---- + XEXT_LIBRARY=-lXext + FVWM_LIBRARY=-l${fvwm_name} + RPLAY_LIBRARY=-lrplay +! LIBS=-L${top_srcdir}/libs ${x_libraries} ${FVWM_LIBRARY} ${XPM_LIBRARY} ${XEXT_LIBRARY} ${X_LIBRARY} -L${libdir} ${RPLAY_LIBRARY} + +! EXTRA_DEFINES=-DXPM -DSHAPE -DHAVE_RPLAY + CC=@CC@ +! INCLUDES=-I${top_srcdir}/include ${x_includes} ${includedir} + CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} + MAKEDEPEND=@MAKEDEPEND@ + INSTALL=@INSTALL@ |