Alejandro Mery <amery@geeks.cl>:

introduces $includedir
sets share and include inside /usr when prefix=''


git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@1416 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc

Documentation/Developers/CHANGELOG-RENE

@@ -10,6 +10,8 @@
  - Stefan Paletta: implemented enlightenment category
  - Mathieu: updated gnomemeeting and lftp
  - Dimitar Zhekov: fix gcc3 optimisation
+ - Sirkull: dcc update
+ - Alejandro Mery: fix to handle /share and /include when prefix=''
 
 *) 2003-09-14 (2.0.0-rc1 - 2.0.0-rc2)
 

Documentation/Developers/PKG-BUILD-VARS

@@ -49,6 +49,7 @@ datadir ....... where the arch-indep. data should be installed (i.e. share)
 docdir ........ where the documentation should be installed
 mandir ........ where the info man pages should be installed
 infodir ....... where the info files should be installed
+includedir .... where the header files should be installed
 
 autoextract ... '0' = skip automatic untar
 autopatch ..... '0' = skip automatic patching

scripts/Build-Pkg

@@ -385,11 +385,11 @@ then
 	makeinstopt="$makeopt"' prefix=$root/$prefix install'
 
 	for x in prefix bindir sbindir libdir datadir \
-	         infodir mandir sysconfdir localstatedir
+	         infodir mandir sysconfdir localstatedir \
+	         includedir
 	do
 		makeopt="$makeopt $x=\${$x/${root//\//\\/}/}"
 	done
-	makeopt="$makeopt"' includedir=$root/usr/include'
 else
 	makeopt='prefix=/$prefix CC="$CC" CXX="$CXX"'
 	makeinstopt='prefix=/$prefix CC="$CC" CXX="$CXX" install'
@@ -502,7 +502,7 @@ fi
 # ---- Variable updates based on the configuration files read
 #
 
-if [ "${prefix#usr}" != "$prefix" ] ; then
+if [ -z "$prefix" -o "${prefix#usr}" != "$prefix" ] ; then
 	flistdel="$flistdel|usr/share/info/(dir|standards.info)"
 	if [ "$ROCKCFG_DISABLE_NLS" = 1 ] ; then
 		flistdel="$flistdel|usr/share/locale/..[/_].*"

scripts/functions

@@ -134,7 +134,6 @@ copy_function() {
 #
 set_confopt() {
 	confopt="--prefix=$root/$prefix"
-	docdir="$root/$prefix/doc/$pkg"
 
 	bindir="$root/$prefix/bin"
 	confopt="$confopt --bindir=\$bindir"
@@ -145,13 +144,25 @@ set_confopt() {
 	libdir="$root/$prefix/lib"
 	confopt="$confopt --libdir=\$libdir"
 
-	datadir="$root/$prefix/share"
+	if [ -z "$prefix" ]; then
+		datadir="$root/usr/share"
+		includedir="$root/usr/include"
+
+		docdir="$root/usr/doc/$pkg"
+		infodir="$root/usr/info"
+		mandir="$oot/usr/man"
+	else
+		datadir="$root/$prefix/share"
+		includedir="$root/$prefix/include"
+
+		docdir="$root/$prefix/doc/$pkg"
+		infodir="$root/$prefix/info"
+		mandir="$root/$prefix/man"
+	fi
 	confopt="$confopt --datadir=\$datadir"
+	confopt="$confopt --includedir=\$includedir"
 
-	infodir="$root/$prefix/info"
 	confopt="$confopt --infodir=\$infodir"
-
-	mandir="$root/$prefix/man"
 	confopt="$confopt --mandir=\$mandir"
 
 	if [ "${prefix#opt/}" != "$prefix" ] ; then