[Pkg-ossec-devel] [SCM] Git repository for pkg-ossec branch, debian, updated. d0ad8e772dd5cf24f1fb2930590ba6044b560427

[Jose Antonio Quevedo]

The following commit has been merged in the debian branch:
commit d0ad8e772dd5cf24f1fb2930590ba6044b560427
Author: Jose Antonio Quevedo <joseantonio.quevedo at gmail.com>
Date:   Sat Jul 23 23:08:15 2011 +0200

    debian/rules chaged to use $DESTDIR functionality.

diff --git a/debian/rules b/debian/rules
index 3829c3a..1bba36c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,7 +35,6 @@ configure-%: configure-stamp
 	BUILD="yes"	# variable used to stop the installation script
 
 
-
 configure-local:
 
 	USER_INSTALL_TYPE="local"
@@ -49,18 +48,14 @@ configure-agent:
 	USER_INSTALL_TYPE="agent"
 
 
-build-stamp:
+build-local: configure-local
 
 	dh_testdir
-	touch build-stamp
-
-build: build-stamp build-local build-server build-agent
-
-
-build-local: configure-local
 
 	USER_INSTALL_TYPE="local" BUILD="yes" USER_LANGUAGE="en" USER_NO_STOP="no" USER_DIR="/var/ossec" USER_ENABLE_EMAIL="n" EMAIL_NOTIFY="n" USER_ENABLE_ACTIVE_RESPONSE="n" USER_ENABLE_SYSCHECK="n" USER_ENABLE_ROOTCHECK="n" ./install.sh debug
 
+	touch build-local-stamp
+
 build-server: configure-server
 
 # Possible values for:
@@ -69,17 +64,32 @@ build-server: configure-server
 # - USER_DELETE_DIR: set this variable to "y" if you want to delete the $USER_DIR directory without being asked by the system.
 # - 
 
+	dh_testdir
+
 	USER_INSTALL_TYPE="server" BUILD="yes" USER_LANGUAGE="en" USER_NO_STOP="no" ACTIVE_RESPONSE="n" USER_DIR="/var/ossec" USER_DELETE_DIR="" USER_ENABLE_EMAIL="n" EMAIL_NOTIFY="n" USER_ENABLE_ACTIVE_RESPONSE="n" USER_ENABLE_SYSLOG="n" USER_ENABLE_SYSCHECK="n" USER_ENABLE_ROOTCHECK="n" ./install.sh debug
 
+	touch build-server-stamp
+
 build-agent: configure-agent
 
 # - USER_AGENT_SERVER_IP : needed to configure the client. Couldn't we use a domain name?
 #			!! IT WAS SET TO "1.1.1.1" for testing purposes.
 # 
 
+	dh_testdir
+
 	USER_INSTALL_TYPE="agent" BUILD="yes" USER_LANGUAGE="en" USER_NO_STOP="n" ACTIVE_RESPONSE="n" USER_DIR="/var/ossec" USER_DELETE_DIR="" USER_AGENT_SERVER_IP="1.1.1.1" USER_ENABLE_ACTIVE_RESPONSE="n" ./install.sh debug
 
-install: build install-doc install-server install-agent install-local
+	touch build-agent-stamp
+
+build-stamp: build-local build-server build-agent
+
+	touch build-stamp
+
+build: build-stamp 
+
+
+install: install-doc install-server install-agent install-local
 
 
 install-%:
@@ -94,36 +104,34 @@ install-%:
 #	USER_UPDATE = 
 	BUILD="no"
 
-	DESTDIR="$(CURDIR)/debian"
-
-
+	BASE_DESTDIR="$(CURDIR)/debian"
 
 install-doc:
 
 	PKG="$(PKG_BASENAME)-doc"
-	DESTDIR = "$(DESTDIR)/$(PKG)"
+	DESTDIR = "$(BASE_DESTDIR)/$(PKG)"
 
-	# This target needs to be done
+# This target needs to be done
 
 install-local:
 
 	PKG="$(PKG_BASENAME)-local"
-	INSTALLDIR = "$(DESTDIR)/$(PKG)"
+	DESTDIR = "$(BASE_DESTDIR)/$(PKG)"
 
-	USER_INSTALL_TYPE="$(USER_INSTALL_TYPE)" BUILD="$(BUILD)" USER_LANGUAGE="$(USER_LANGUAGE)" USER_NO_STOP="n" ./install.sh
+	USER_INSTALL_TYPE="$(USER_INSTALL_TYPE)" BUILD="$(BUILD)" USER_LANGUAGE="$(USER_LANGUAGE)" USER_NO_STOP="n" USER_DIR="$(DESTDIR)" ./install.sh debug
 
 
 install-server:
 
 	PKG="$(PKG_BASENAME)-server"
-	INSTALLDIR = "$(DESTDIR)/$(PKG)"
+	DESTDIR = "$(BASE_DESTDIR)/$(PKG)"
 
 	USER_INSTALL_TYPE="$(USER_INSTALL_TYPE)" BUILD="$(BUILD)" USER_LANGUAGE="$(USER_LANGUAGE)" USER_NO_STOP="n" ./install.sh
 
 install-client:
 
 	PKG="$(PKG_BASENAME)-client"
-	INSTALLDIR = "$(DESTDIR)/$(PKG)"
+	DESTDIR = "$(BASE_DESTDIR)/$(PKG)"
 
 	USER_INSTALL_TYPE="$(USER_INSTALL_TYPE)" BUILD="$(BUILD)" USER_LANGUAGE="$(USER_LANGUAGE)" USER_NO_STOP="n" ./install.sh
 

-- 
Git repository for pkg-ossec