Merge branch 'master' of ssh://git.ipfire.org/pub/git/pakfire

[pakfire.git] / Makeconfig

diff --git a/Makeconfig b/Makeconfig
index 158ee3da5a4c171159184b272cdcfb58f75c32ba..aa3124367975cf74123850a34ebc4ed77842321b 100644 (file)
--- a/Makeconfig
+++ b/Makeconfig
@@ -1,9 +1,9 @@
 
 PACKAGE_NAME    = pakfire
-PACKAGE_VERSION = 0.9.17
+PACKAGE_VERSION = 0.9.25
 PACKAGE_AUTHOR  = IPFire.org Team
 PACKAGE_AUTHOR_EMAIL = info@ipfire.org
-PACKAGE_URL     = http://redmine.ipfire.org/projects/buildsystem3
+PACKAGE_URL     = http://git.ipfire.org/?p=pakfire.git;a=summary
 PACKAGE_VERSION_FILE = pakfire/__version__.py
 
 PREFIX ?= /usr
@@ -12,13 +12,17 @@ PREFIX ?= /usr
 DEBIAN = $(shell test -e /etc/debian_version && echo 1 || echo 0)
 
 CC = gcc
-CFLAGS ?= -O2 -pipe
+CFLAGS ?= -O2 -fPIC -pipe
 MACHINE = $(shell uname -m)
 
-ifeq "$(MACHINE)" "x86_64"
+ifeq "$(DEBIAN)" "0"
+ ifeq "$(MACHINE)" "x86_64"
        LIBDIR = $(PREFIX)/lib64
-else
+ else
        LIBDIR = $(PREFIX)/lib
+ endif
+else
+ LIBDIR = $(PREFIX)/lib
 endif
 
 # Get the version and configuration of the python interpreter.
@@ -27,7 +31,7 @@ ifeq "$(PYTHON_VERSION)" ""
   $(error Could not determine the version of the python interpreter.)
 endif
 
-PYTHON_CC      = $(CC) -pthread -fPIC
+PYTHON_CC      = $(CC) -pthread -fPIC -std=c99
 PYTHON_CFLAGS  = $(shell python-config --cflags)
 PYTHON_MODULES = pakfire pakfire/packages pakfire/repository
 ifeq "$(DEBIAN)" "1"
@@ -35,6 +39,8 @@ ifeq "$(DEBIAN)" "1"
 else
        PYTHON_DIR = $(LIBDIR)/python$(PYTHON_VERSION)/site-packages
 endif
+PYTHON_FILES   = $(addsuffix /*.py,$(addprefix python/,$(PYTHON_MODULES)))
+PYTHON_FILES  += tools/pakfire-multicall.py
 
 # The place, where all internally used scripts and bins are copied.
 SCRIPT_DIR     = $(PREFIX)/lib/$(PACKAGE_NAME)
@@ -43,5 +49,7 @@ TOP := $(dir $(lastword $(MAKEFILE_LIST)))
 
 # A list of all files that contain translations and need to
 # be indexed.
-TRANS_FILES  = $(addsuffix /*.py,$(addprefix python/,$(PYTHON_MODULES)))
-TRANS_FILES += python/src/*.c scripts/pakfire-multicall.py
+TRANS_FILES  = $(PYTHON_FILES) python/src/*.c
+
+# systemd unit files
+UNIT_FILES = $(wildcard systemd/*.service)