Sync changes for Ubuntu build from master.

debian/rules

@@ -11,27 +11,21 @@
 # build-arch and build-indep targets  by Bill Allombert 2001
 
 # Uncomment this to turn on verbose mode.
-export DH_VERBOSE=1
+DH_VERBOSE = 1
 
 # This has to be exported to make some magic below work.
-export DH_OPTIONS=-v
+DH_OPTIONS = -v
 
-#export DEB_BUILD_OPTIONS=noopt
-#export DEB_CFLAGS_MAINT_APPEND=-O0
-export CFLAGS=-g -O0
-export CXXFLAGS=-g -O0
-
-export daemon_user=bareos
-export daemon_group=bareos
-export director_daemon_user=${daemon_user}
-export storage_daemon_user=${daemon_user}
-export file_daemon_user=root
-export storage_daemon_group=${daemon_group}
-export working_dir=/var/lib/bareos
-
-#	./configure --build=x86_64-linux-gnu --prefix=/usr --includedir=\${prefix}/include --mandir=\${prefix}/share/man --infodir=\${prefix}/share/info --sysconfdir=/etc --localstatedir=/var --libexecdir=\${prefix}/lib/bareos --disable-maintainer-mode --disable-dependency-tracking --with-sbin-perm=755 --sysconfdir=/etc/bareos --mandir= --docdir=%{_docdir}/%{name} --htmldir=%{_docdir}/%{name}/html --with-scriptdir=%{script_dir} --with-working-dir=%{working_dir} --with-plugindir=%{script_dir} --with-pid-dir=%{pid_dir} --with-subsys-dir=%{_subsysdir} --enable-smartalloc --disable-conio --enable-readline --enable-batch-insert --enable-dynamic-cats-backends --enable-acl --enable-xattr --with-postgresql --with-tcp-wrappers --with-scsi-crypto --with-ndmp --with-openssl --with-basename=XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX --enable-includes
+DAEMON_USER = bareos
+DAEMON_GROUP = bareos
+DIRECTOR_DAEMON_USER = $(DAEMON_USER)
+STORAGE_DAEMON_USER = $(DAEMON_USER)
+FILE_DAEMON_USER = root
+STORAGE_DAEMON_GROUP = $(DAEMON_GROUP)
+WORKING_DIR = /var/lib/bareos
 
 override_dh_auto_configure:
+	export LDFLAGS="" && \
 	dh_auto_configure --    \
   --with-sbin-perm=755 \
   --sysconfdir=/etc/bareos \
@@ -58,12 +52,12 @@ override_dh_auto_configure:
   --with-sqlite3 \
   --with-tcp-wrappers \
   --with-openssl \
-  --with-dir-user=${director_daemon_user} \
-  --with-dir-group=${daemon_group} \
-  --with-sd-user=${storage_daemon_user} \
-  --with-sd-group=${storage_daemon_group} \
-  --with-fd-user=${file_daemon_user} \
-  --with-fd-group=${daemon_group} \
+  --with-dir-user=$(DIRECTOR_DAEMON_USER) \
+  --with-dir-group=$(DAEMON_GROUP) \
+  --with-sd-user=$(STORAGE_DAEMON_USER) \
+  --with-sd-group=$(STORAGE_DAEMON_GROUP) \
+  --with-fd-user=$(FILE_DAEMON_USER) \
+  --with-fd-group=$(DAEMON_GROUP) \
   --with-dir-password="XXX_REPLACE_WITH_DIRECTOR_PASSWORD_XXX" \
   --with-fd-password="XXX_REPLACE_WITH_CLIENT_PASSWORD_XXX" \
   --with-sd-password="XXX_REPLACE_WITH_STORAGE_PASSWORD_XXX" \
@@ -74,9 +68,8 @@ override_dh_auto_configure:
   --with-hostname="XXX_REPLACE_WITH_LOCAL_HOSTNAME_XXX" \
   --enable-includes
 
-#  --docdir="\${_docdir}/bareos" \
-#  --htmldir="\${_docdir}/bareos/html" \
-
+#  --docdir="\$(_docdir)/bareos" \
+#  --htmldir="\$(_docdir)/bareos/html" \
 
 override_dh_fixperms:
 	# all files in /etc/bareos