diff options
| author |   Ralph Sennhauser <sera@gentoo.org> | 2013-02-13 22:08:09 +0000 |
|---|---|---|
| committer | Ralph Sennhauser <sera@gentoo.org> | 2013-02-13 22:08:09 +0000 |
| commit | 2517bd4eb68d06e45f312aca9cd8977234bed669 (patch) | |
| tree | ee60da32fd5c7b0f844e131518b1a58f01532012 /src | |
| parent | Fill NEWS stub with some content (diff) | |
| download | baselayout-java-2517bd4eb68d06e45f312aca9cd8977234bed669.tar.gz baselayout-java-2517bd4eb68d06e45f312aca9cd8977234bed669.tar.bz2 baselayout-java-2517bd4eb68d06e45f312aca9cd8977234bed669.zip | |
Prefixify files that need it
svn path=/projects/baselayout-java/trunk/; revision=9212
Diffstat (limited to 'src')
| -rw-r--r-- | src/20java-config | 1 | ||||
| -rw-r--r-- | src/20java-config.in | 1 | ||||
| -rw-r--r-- | src/java-config-2.csh.in (renamed from src/java-config-2.csh) | 7 | ||||
| -rw-r--r-- | src/java-config-2.sh.in (renamed from src/java-config-2.sh) | 9 |
4 files changed, 8 insertions, 10 deletions
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 |