From 2563b2956d6520d4d2b37f678db4247d15b4ce3e Mon Sep 17 00:00:00 2001
From: Marcin Haba <marcin.haba@bacula.pl>
Date: Sun, 16 Aug 2015 01:36:23 +0200
Subject: [PATCH] baculum: Change Makefile to using also for deb packages
 template

---
 gui/baculum/Makefile | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gui/baculum/Makefile b/gui/baculum/Makefile
index 69beecefd1..d6a9df1077 100644
--- a/gui/baculum/Makefile
+++ b/gui/baculum/Makefile
@@ -1,22 +1,24 @@
-# Makefile to prepare runtime files (mainly for rpm based distributions)
+# Makefile to prepare runtime files (for rpm-based and deb-based distributions)
 #
 # usage: make DESTDIR=/some/runtime_dir
 
 NAME = baculum
 VERSION = 7.2.0
-SAMPLETYPE = rpm-template
+SAMPLETYPE = $(SAMPLETYPE:-rpm-template)
+HTTPDNAME = $(HTTPDNAME:-httpd)
+HTTPDSITECONF = $(HTTPDSITECONF:-conf.d)
 SYSUSRDIR = /usr
 SYSCONFDIR = /etc
 SYSVARDIR = /var
 CONFDIR = $(SYSCONFDIR)/$(NAME)
-HTTPDCONFDIR = $(SYSCONFDIR)/httpd/conf.d
+HTTPDCONFDIR = $(SYSCONFDIR)/$(HTTPDNAME)/$(HTTPDSITECONF)
 UNITDIR = $(SYSUSRDIR)/lib/systemd/system
 LOCALEDIR = $(SYSUSRDIR)/share/locale
 WWWDIR = $(SYSUSRDIR)/share/$(NAME)/htdocs
 SELINUXDIR = $(SYSUSRDIR)/share/selinux/packages/$(NAME)
 CACHEDIR = $(SYSVARDIR)/cache/$(NAME)
 LOGDIR = $(SYSVARDIR)/log
-HTTPDLOGS = $(LOGDIR)/httpd
+HTTPDLOGS = $(LOGDIR)/$(HTTPDNAME)
 LIGHTTPDLOGS = $(LOGDIR)/lighttpd
 
 # Internal application directories
-- 
2.39.5