From 20e6b052b4aac09f78f5f65d9e2cc092ff4f8d80 Mon Sep 17 00:00:00 2001 From: Christian Wiese Date: Tue, 24 May 2011 10:53:03 +0200 Subject: [PATCH] pound: removed capability to configure the prefix via 'Config' --- network/pound/config.in | 3 +-- network/pound/pound.conf | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/network/pound/config.in b/network/pound/config.in index afece2afd..df8ab346b 100644 --- a/network/pound/config.in +++ b/network/pound/config.in @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../pound/config.in +# Copyright (C) 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -14,8 +15,6 @@ if pkgcheck pound X then menu_begin MENU_PKG_POUND 'Pound Package Options' - text 'Install prefix for Pound package' \ - SDECFG_PKG_POUND_PREFIX "opt/pound" bool "Daemon support" SDECFG_PKG_POUND_DAEMON 1 bool "Supervisor process support" SDECFG_PKG_POUND_SUPER 1 diff --git a/network/pound/pound.conf b/network/pound/pound.conf index c87365d18..2ebb69453 100644 --- a/network/pound/pound.conf +++ b/network/pound/pound.conf @@ -2,7 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../pound/pound.conf -# Copyright (C) 2008 The OpenSDE Project +# Copyright (C) 2008 - 2011 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -14,11 +14,7 @@ # --- SDE-COPYRIGHT-NOTE-END --- if [ $prefix_auto = 1 ] ; then - if [ "$SDECFG_PKG_POUND_PREFIX" ] ; then - prefix="$SDECFG_PKG_POUND_PREFIX" - else - prefix="opt/pound" - fi + prefix="opt/pound" set_confopt fi