SOURCES: wmii-9base.patch - config.mk chamges moved do Makefile.patch

[sparky]

Author: sparky                       Date: Fri Jan 27 20:55:24 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- config.mk chamges moved do Makefile.patch

---- Files affected:
SOURCES:
   wmii-9base.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/wmii-9base.patch
diff -u SOURCES/wmii-9base.patch:1.1 SOURCES/wmii-9base.patch:1.2
--- SOURCES/wmii-9base.patch:1.1	Fri Jan 27 18:51:56 2006
+++ SOURCES/wmii-9base.patch	Fri Jan 27 21:55:19 2006
@@ -27,41 +27,6 @@
  
  # mount ixp file systems:
  wmiir write /ctl 'bind /wm /tmp/.ixp-'^$USER/wmiiwm-$WMII_IDENT
-diff -Nur wmii-2.5.1/config.mk wmii-2.5.1.new/config.mk
---- wmii-2.5.1/config.mk	2006-01-12 16:36:54.000000000 +0000
-+++ wmii-2.5.1.new/config.mk	2006-01-27 15:52:13.000000000 +0000
-@@ -1,15 +1,15 @@
- # Customize to fit your system
- 
- # paths
--PREFIX = /usr/local
--CONFPREFIX = ${PREFIX}/etc
-+PREFIX = /usr
-+CONFPREFIX = /etc/X11
- MANPREFIX = ${PREFIX}/share/man
--9PREFIX = ${PREFIX}/9
-+9PREFIX = /usr
- 
- INCDIR = ${PREFIX}/include
--LIBDIR = ${PREFIX}/lib
-+LIBDIR = ${PREFIX}/$(LIB)
- X11INC = /usr/X11R6/include
--X11LIB = /usr/X11R6/lib
-+X11LIB = /usr/X11R6/$(LIB)
- 
- # includes and libs
- INCLUDES = -I. -I${INCDIR} -I/usr/include -I${X11INC}
-@@ -17,8 +17,8 @@
- VERSION = 2.5.1
- 
- # flags
--CFLAGS = -g -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
--LDFLAGS = ${LIBS}
-+CFLAGS = $(OPTCFLAGS) -Wall ${INCLUDES} -DVERSION=\"${VERSION}\"
-+LDFLAGS = $(OPTLDFLAGS) ${LIBS}
- 
- # compiler
- # Note: - under Solaris add -D__EXTENSIONS__ to CFLAGS
 diff -Nur wmii-2.5.1/rc/extern wmii-2.5.1.new/rc/extern
 --- wmii-2.5.1/rc/extern	2006-01-12 16:36:54.000000000 +0000
 +++ wmii-2.5.1.new/rc/extern	2006-01-27 15:53:27.000000000 +0000
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/wmii-9base.patch?r1=1.1&r2=1.2&f=u