summaryrefslogtreecommitdiff
path: root/x11/fvwm95/patches/patch-aa
blob: 82c4699811afdc3642a18bb9fb7828196b0d536e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
$NetBSD: patch-aa,v 1.2 1998/08/07 11:18:03 agc Exp $

*** modules/FvwmAudio/Makefile.in.orig	Tue Sep 10 22:25:33 1996
--- modules/FvwmAudio/Makefile.in	Fri Jun 13 21:41:10 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} -I${includedir}
  CFLAGS=${INCLUDES} @CFLAGS@ ${EXTRA_DEFINES} 
  MAKEDEPEND=@MAKEDEPEND@
  INSTALL=@INSTALL@