--- branches/mage-next/src/env-rebuild.in	2014/01/29 11:42:08	2547
+++ branches/mage-next/src/env-rebuild.in	2014/01/29 11:46:20	2548
@@ -1,7 +1,7 @@
 #!/bin/bash
 # $Id$
 #
-# rebuilds /etc/{ld.so.conf,profile.env} with given files from /etc/env.d
+# rebuilds @@SYSCONFDIR@@/{ld.so.conf,profile.env} with given files from @@ENVDDIR@@
 #
 
 SPECIALVARS="KDEDIRS PATH CLASSPATH LDPATH MANPATH INFODIR INFOPATH ROOTPATH"
@@ -21,14 +21,14 @@
 echo -en "\n>>>> Rebuilding environment... "
 
 # clean existing conf files
-:> ${MROOT}/etc/ld.so.conf
-:> ${MROOT}/etc/profile.env
+:> ${MROOT}@@SYSCONFDIR@@/ld.so.conf
+:> ${MROOT}@@SYSCONFDIR@@/profile.env
 
-# read everything from /etc/env.d
-for file in ${MROOT}/etc/env.d/*
+# read everything from @@ENDDIR@@
+for file in ${MROOT}@@ENVDDIR@@/*
 do
 	# abort if "empty"
-	[[ ${file} = ${MROOT}/etc/env.d/\* ]] && continue
+	[[ ${file} = ${MROOT}@@ENVDDIR@@/\* ]] && continue
 
 	# reads content of every file
 	while read line
@@ -45,11 +45,11 @@
 		value="${value//\"}"	#}" <--- make code readable again :)
 		value="${value//\'}"
 
-		# writes LDPATH to ${MROOT}/etc/ld.so.conf,
-		# anything else to ${MROOT}/etc/profile.env
+		# writes LDPATH to ${MROOT}@@SYSCONFDIR@@/ld.so.conf,
+		# anything else to ${MROOT}@@SYSCONFDIR@@/profile.env
 		if [[ ${variable} = LDPATH ]]
 		then
-			echo "${value}" >> ${MROOT}/etc/ld.so.conf
+			echo "${value}" >> ${MROOT}@@SYSCONFDIR@@/ld.so.conf
 		else
 			# checks if var exists in specialvars
 			for i in ${SPECIALVARS}
@@ -100,8 +100,8 @@
 done
 
 # rebuilds environment
-ldconfig -r "${MROOT}" -f /etc/ld.so.conf -C /etc/ld.so.cache
-[ -f ${MROOT}/etc/profile ] && source ${MROOT}/etc/profile
+ldconfig -r "${MROOT}" -f @@SYSCONFDIR@@/ld.so.conf -C @@SYSCONFDIR@@/ld.so.cache
+[ -f ${MROOT}@@SYSCONFDIR@@/profile ] && source ${MROOT}@@SYSCONFDIR@@/profile
 
 # cleanups
 [ -d ${TMPDIR} ] && rm -rf ${TMPDIR}