Prefixify files that need it

svn path=/projects/baselayout-java/trunk/; revision=9212

6 files changed, 31 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index f6c9eb0..02c411d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,19 +11,28 @@ dist_pixmaps_DATA = \
 	icons/java-icon48.png
 
 envddir = $(sysconfdir)/env.d
-dist_envd_DATA = \
+envd_DATA = \
 	src/20java-config
 
+EXTRA_DIST = \
+	src/20java-config.in
+
 profileddir = $(sysconfdir)/profile.d
-dist_profiled_DATA = \
+profiled_DATA = \
 	src/java-config-2.csh \
 	src/java-config-2.sh
 
+EXTRA_DIST += \
+	src/java-config-2.csh.in \
+	src/java-config-2.sh.in
+
 revdepdir = $(sysconfdir)/revdep-rebuild
 dist_revdep_DATA = \
 	src/60-java
 
-EXTRA_DIST = \
+CLEANFILES = $(envd_DATA) $(profiled_DATA)
+
+EXTRA_DIST += \
 	COPYING \
 	NEWS \
 	README
@@ -36,6 +45,11 @@ MAINTAINERCLEANFILES = \
 	Makefile.in \
 	INSTALL
 
+create-src-dir:
+	$(MKDIR_P) $(top_builddir)/src
+
+$(envd_DATA) $(profiled_DATA): | create-src-dir
+	$(SED) "s|\@GENTOO_PORTAGE_EPREFIX\@|@EPREFIX@|g" $(top_srcdir)/$@.in >$@
 
 dist-hook:
 	if test -d "$(srcdir)"/.svn ; then \
diff --git a/configure.ac b/configure.ac
index 5f2c456..87f0b82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,13 @@
 AC_INIT([baselayout-java],[0.1.0],[java@gentoo.org],[baselayout-java],[https://bugs.gentoo.org/])
 AC_PREREQ([2.68])
-AC_CONFIG_SRCDIR([src/java-config-2.sh])
+AC_CONFIG_SRCDIR([src/java-config-2.sh.in])
 AM_INIT_AUTOMAKE([1.11])
 
+AC_PROG_MKDIR_P
+AC_PROG_SED
+
+AC_ARG_VAR([EPREFIX],[Gentoo Prefix offset])
+
 AC_CONFIG_FILES([Makefile])
 
 AC_OUTPUT
diff --git a/src/20java-config b/src/20java-config
deleted file mode 100644
index 1128b5d..0000000
--- a/src/20java-config
+++ /dev/null
@@ -1 +0,0 @@
-MANPATH="/etc/java-config-2/current-system-vm/man/"
diff --git a/src/20java-config.in b/src/20java-config.in
new file mode 100644
index 0000000..bad776c
--- /dev/null
+++ b/src/20java-config.in
@@ -0,0 +1 @@
+MANPATH="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm/man/"
diff --git a/src/java-config-2.csh b/src/java-config-2.csh.in
index 517a054..ad2df86 100644
--- a/src/java-config-2.csh
+++ b/src/java-config-2.csh.in
@@ -1,9 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.csh,v 1.3 2007/01/13 17:17:08 grobian Exp $
 
-set gentoo_user_vm = "${HOME}/.gentoo/java-config-2/current-user-vm"
-set gentoo_system_vm = "/etc/java-config-2/current-system-vm"
+set gentoo_user_vm = "${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
+set gentoo_system_vm = "@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm"
 
 ## If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
 ## Otherwise set to the current system vm
diff --git a/src/java-config-2.sh b/src/java-config-2.sh.in
index 49155d1..70f3e7d 100644
--- a/src/java-config-2.sh
+++ b/src/java-config-2.sh.in
@@ -1,10 +1,9 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/dev-java/java-config/files/java-config-2.profiled.sh-r1,v 1.1 2007/03/16 11:13:16 betelgeuse Exp $
 
 # If we have a current-user-vm (and aren't root)... set it to JAVA_HOME
-gentoo_user_vm="${HOME}/.gentoo/java-config-2/current-user-vm"
-gentoo_system_vm="/etc/java-config-2/current-system-vm"
+gentoo_user_vm="${HOME}/.gentoo@GENTOO_PORTAGE_EPREFIX@/java-config-2/current-user-vm"
+gentoo_system_vm="@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm"
 
 # Please make sure that this script is POSIX compliant
 # See https://bugs.gentoo.org/show_bug.cgi?id=169925
@@ -23,7 +22,7 @@ fi
 if [ "${user_id}" != 0 -a -L "${gentoo_user_vm}" ]; then
 	export JAVA_HOME=${gentoo_user_vm}
 # Otherwise set to the current system vm
-elif [ -L /etc/java-config-2/current-system-vm ]; then
+elif [ -L "@GENTOO_PORTAGE_EPREFIX@/etc/java-config-2/current-system-vm" ]; then
 	export JAVA_HOME=${gentoo_system_vm}
 fi