From c2f7fc047c2e5bbb899c820590ce07fee593b28f Mon Sep 17 00:00:00 2001 From: ChrisTX Date: Sun, 23 Sep 2012 12:30:30 +0200 Subject: Replace hardcoded paths with configurable ones This patchset aims to ease the packaging of InspIRCd for a system-wide installation scenario. Changes in detail: configure: Add the options --log-path and --data-path m_ssl_gnutls, openssl: Change the hardcoded "conf/" to the existent CONFIG_PATH macro m_xline_db: Make the location of xline.db configurable. It will use --data-path as default value, but this can be changed using the configuration files. --- make/template/inspircd | 4 ++-- make/template/main.mk | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) (limited to 'make/template') diff --git a/make/template/inspircd b/make/template/inspircd index a75140c5d..88eb7ee6a 100644 --- a/make/template/inspircd +++ b/make/template/inspircd @@ -26,7 +26,7 @@ use Fcntl; my $basepath = "@BASE_DIR@"; my $confpath = "@CONFIG_DIR@/"; my $binpath = "@BINARY_DIR@"; -my $runpath = "@BASE_DIR@"; +my $runpath = "@DATA_DIR@"; my $valgrindlogpath = "$basepath/valgrindlogs"; my $executable = "@EXECUTABLE@"; my $version = "@VERSION@"; @@ -382,7 +382,7 @@ sub getpidfile } # End of includes / No includes found. Using default. - $pidfile = $runpath . "/data/inspircd.pid"; + $pidfile = $runpath . "/inspircd.pid"; } sub getstatus { diff --git a/make/template/main.mk b/make/template/main.mk index 3d7b8a694..d4e8de287 100644 --- a/make/template/main.mk +++ b/make/template/main.mk @@ -42,6 +42,7 @@ PICLDFLAGS = -fPIC -shared -rdynamic $(LDFLAGS) BASE = "$(DESTDIR)@BASE_DIR@" CONPATH = "$(DESTDIR)@CONFIG_DIR@" MODPATH = "$(DESTDIR)@MODULE_DIR@" +DATPATH = "$(DESTDIR)@DATA_DIR@" BINPATH = "$(DESTDIR)@BINARY_DIR@" INSTUID = @UID@ INSTMODE_DIR = 0755 @@ -236,6 +237,7 @@ install: target @echo ' Configuration:' $(CONPATH) @echo ' Binaries:' $(BINPATH) @echo ' Modules:' $(MODPATH) + @echo ' Data:' $(DATPATH) @echo 'To start the ircd, run:' $(BASE)/inspircd start @echo 'Remember to create your config file:' $(CONPATH)/inspircd.conf @echo 'Examples are available at:' $(CONPATH)/examples/ -- cgit v1.2.3