Pathes and variables patch for building

archiveopteryx-3.1.3-gentoo.patch (text/plain), 2.12 KB, created by Alexander Dubov on 2010-12-02 07:17:50 UTC

diff -ur archiveopteryx-3.1.3.orig/Jamsettings archiveopteryx-3.1.3/Jamsettings
--- archiveopteryx-3.1.3.orig/Jamsettings	2010-03-10 23:17:56.000000000 +1100
+++ archiveopteryx-3.1.3/Jamsettings	2010-11-30 19:37:34.844316108 +1100
@@ -4,6 +4,8 @@
 #
 # Remember the spaces around '=' and before ';'.
 
+PACKAGENAME ?= archiveopteryx ;
+
 ## Files and directories. The directory names MUST NOT end with /.
 
 # Prepended to directory names during installation, but not during use.
@@ -12,7 +14,7 @@
 
 # A convenient prefix used by most directory and file names,.
 #
-PREFIX ?= /usr/local/archiveopteryx ;
+PREFIX ?= /usr ;
 
 # The directory for user and sysadmin tools
 #
@@ -24,36 +26,36 @@
 
 # The directory where the man pages are installed
 #
-MANDIR = $(PREFIX)/man ;
+MANDIR = $(PREFIX)/share/man ;
 
 # Supporting files
 #
-LIBDIR = $(PREFIX)/lib ;
+LIBDIR = $(PREFIX)/libexec/$(PACKAGENAME) ;
 
 # The startup/shutdown script's directory
 #
-INITDIR = $(LIBDIR) ;
+INITDIR = /etc/$(PACKAGENAME) ;
 
 # Where to write pid files for the servers
 #
-PIDFILEDIR ?= $(PREFIX)/lib/pidfiles ;
+PIDFILEDIR = /var/run/$(PACKAGENAME) ;
 
 # The servers chroot to an empty, unreadable jail directory at
 # startup.
 #
-JAILDIR = $(PREFIX)/jail ;
+JAILDIR = $(PIDFILEDIR)/jail ;
 
 # This is the default message-copy-directory.
 #
-MESSAGEDIR = $(PREFIX)/messages ;
+MESSAGEDIR = /var/spool/$(PACKAGENAME) ;
 
 # The directory where the configuration file is located.
 #
-CONFIGDIR = $(PREFIX) ;
+CONFIGDIR = $(INITDIR) ;
 
 # The directory where the README and other files are installed.
 #
-READMEDIR = $(PREFIX) ;
+READMEDIR ?= /usr/share/doc/$(PACKAGENAME) ;
 
 # The log file's default name. (This can be a file name or syslog/x,
 # where x is a facility.)
@@ -71,8 +73,8 @@
 
 # How to compile
 
-C++FLAGS = -g -Werror -funsigned-char ;
-LINKFLAGS = -g ;
+C++FLAGS = $(CXXFLAGS) -funsigned-char ;
+LINKFLAGS = $(LDFLAGS) -g ;
 
 # Mode for installed binaries
 
@@ -125,7 +127,7 @@
 # (You can override these values when you run the installer.)
 #
 
-DBNAME ?= archiveopteryx ;
+DBNAME ?= $(PACKAGENAME) ;
 DBSCHEMA ?= public ;
 DBOWNER ?= aoxsuper ;
 DBOWNERPASS ?= "" ;