X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=Makeconfig;h=b9f7898daa27a2acf36c8fd89f14a0af5314e686;hb=90c9f2492736ab3a1d9b202da10803a248b8c0bc;hp=add169a2b0148fd4cc1516239015f41d08a6d42e;hpb=6b25d4f18aa9c3ed9ed3664fd178009d0c64cba9;p=pakfire.git diff --git a/Makeconfig b/Makeconfig index add169a2..b9f7898d 100644 --- a/Makeconfig +++ b/Makeconfig @@ -1,9 +1,9 @@ PACKAGE_NAME = pakfire -PACKAGE_VERSION = 0.9.21 +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 @@ -15,10 +15,14 @@ CC = gcc 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. @@ -29,12 +33,14 @@ endif PYTHON_CC = $(CC) -pthread -fPIC PYTHON_CFLAGS = $(shell python-config --cflags) -PYTHON_MODULES = pakfire pakfire/client pakfire/packages pakfire/repository +PYTHON_MODULES = pakfire pakfire/packages pakfire/repository ifeq "$(DEBIAN)" "1" PYTHON_DIR = $(LIBDIR)/python$(PYTHON_VERSION)/dist-packages 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,4 @@ 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 tools/pakfire-multicall.py +TRANS_FILES = $(PYTHON_FILES) python/src/*.c