SPECS: tolua++.spec, ttf2pt1.spec, w3cam.spec, wavemon.spec - %{_i...

[czucz]

Author: czucz                        Date: Mon Dec 12 18:20:39 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- %{_includedir} macro used

---- Files affected:
SPECS:
   tolua++.spec (1.8 -> 1.9) , ttf2pt1.spec (1.8 -> 1.9) , w3cam.spec (1.14 -> 1.15) , wavemon.spec (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: SPECS/tolua++.spec
diff -u SPECS/tolua++.spec:1.8 SPECS/tolua++.spec:1.9
--- SPECS/tolua++.spec:1.8	Sun Feb  6 18:12:15 2005
+++ SPECS/tolua++.spec	Mon Dec 12 19:20:32 2005
@@ -69,7 +69,7 @@
 scons \
 	CC="%{__cc}" \
 	LUA="%{_prefix}" \
-	CCFLAGS="%{rpmcflags} -fPIC -I/usr/include/lua50"
+	CCFLAGS="%{rpmcflags} -fPIC -I%{_includedir}/lua50"
 
 %{__cc} src/lib/tolua_{event,is,map,push,to}.o -shared -llua50 -llualib50 -ldl -lm -o lib/libtolua++.so
 %{__cc} -o bin/tolua++ src/bin/toluabind.o src/bin/tolua.o -Llib -ltolua++
@@ -108,6 +108,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/12/12 18:20:32  czucz
+- %{_includedir} macro used
+
 Revision 1.8  2005/02/06 17:12:15  czucz
 - updated to 1.0.4
 

================================================================
Index: SPECS/ttf2pt1.spec
diff -u SPECS/ttf2pt1.spec:1.8 SPECS/ttf2pt1.spec:1.9
--- SPECS/ttf2pt1.spec:1.8	Sun Jun 27 23:40:34 2004
+++ SPECS/ttf2pt1.spec	Mon Dec 12 19:20:32 2005
@@ -41,7 +41,7 @@
 	CC="%{__cc}" \
 	CFLAGS_SYS='%{rpmcflags} -D_GNU_SOURCE' \
 	LIBS_SYS='-lm' \
-	CFLAGS_FT='-DUSE_FREETYPE -I/usr/include/freetype2' \
+	CFLAGS_FT='-DUSE_FREETYPE -I%{_includedir}/freetype2' \
 	CFLAGS_PREF='-DPREFER_FREETYPE' \
 	LIBS_FT='-L/usr/lib -lfreetype' \
 	INSTDIR=%{_prefix}
@@ -76,6 +76,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2005/12/12 18:20:32  czucz
+- %{_includedir} macro used
+
 Revision 1.8  2004/06/27 21:40:34  kolodko
 - up to 3.4.4
 - back %{_libdir}/ttf2pt1

================================================================
Index: SPECS/w3cam.spec
diff -u SPECS/w3cam.spec:1.14 SPECS/w3cam.spec:1.15
--- SPECS/w3cam.spec:1.14	Fri Apr  9 17:16:14 2004
+++ SPECS/w3cam.spec	Mon Dec 12 19:20:32 2005
@@ -68,7 +68,7 @@
 
 %build
 %{__autoconf}
-CFLAGS="%{rpmcflags} -I/usr/include/freetype"
+CFLAGS="%{rpmcflags} -I%{_includedir}/freetype"
 %configure \
 	--with-syslog
 %{__make}
@@ -108,6 +108,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.15  2005/12/12 18:20:32  czucz
+- %{_includedir} macro used
+
 Revision 1.14  2004/04/09 15:16:14  qboosh
 - updated URLs, fixed build, release 3 for Ac
 

================================================================
Index: SPECS/wavemon.spec
diff -u SPECS/wavemon.spec:1.7 SPECS/wavemon.spec:1.8
--- SPECS/wavemon.spec:1.7	Mon Apr 18 12:17:41 2005
+++ SPECS/wavemon.spec	Mon Dec 12 19:20:32 2005
@@ -30,7 +30,7 @@
 cp -f /usr/share/automake/config.sub .
 %configure2_13
 %{__make} \
-	CFLAGS="-I/usr/include/ncurses %{rpmcflags}"
+	CFLAGS="-I%{_includedir}/ncurses %{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -55,6 +55,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2005/12/12 18:20:32  czucz
+- %{_includedir} macro used
+
 Revision 1.7  2005/04/18 10:17:41  qwark
 - added gcc34 patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tolua++.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/ttf2pt1.spec?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/SPECS/w3cam.spec?r1=1.14&r2=1.15&f=u
    http://cvs.pld-linux.org/SPECS/wavemon.spec?r1=1.7&r2=1.8&f=u