From c96443bcb32b0cede5ae1113c028d3e3dfc2ad01 Mon Sep 17 00:00:00 2001 From: Mattias Andrée Date: Thu, 1 Aug 2013 02:20:44 +0200 Subject: forgot to use prefix and include .h MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Mattias Andrée --- Makefile | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/Makefile b/Makefile index 0aaa0ce..26db881 100644 --- a/Makefile +++ b/Makefile @@ -6,6 +6,7 @@ PREFIX = /usr DATA = /share LIB = /lib +INCLUDE = /include BIN = /bin ENV = /usr$(BIN)/env BASHSHEBANG = $(ENV) bash @@ -57,17 +58,18 @@ bin/argparser.so: src/argparser.c src/argparser.h install: install-python install-bash install-java install-c install-license install-python: bin/argparser.py - install -Dm644 bin/argparser.py "$(DESTDIR)$(LIBPY3)/argparser.py" + install -Dm644 bin/argparser.py "$(DESTDIR)$(PREFIX)$(LIBPY3)/argparser.py" install-bash: bin/argparser.bash - install -Dm644 bin/argparser.bash "$(DESTDIR)$(LIBBASH)/argparser.bash" + install -Dm644 bin/argparser.bash "$(DESTDIR)$(PREFIX)$(LIBBASH)/argparser.bash" install-java: bin/ArgParser.jar - install -Dm644 bin/ArgParser.jar "$(DESTDIR)$(LIBJAVA)/ArgParser.jar" + install -Dm644 bin/ArgParser.jar "$(DESTDIR)$(PREFIX)$(LIBJAVA)/ArgParser.jar" -install-c: bin/argparser.so - install -Dm644 bin/argparser.so "$(DESTDIR)$(LIB)/ArgParser.so.$(VERSION)" +install-c: bin/argparser.so src/argparser.h + install -Dm644 bin/argparser.so "$(DESTDIR)$(LIB)/arggarser.so.$(VERSION)" ln -s "argparser.so.$(VERSION)" "$(DESTDIR)$(LIB)/argparser.so" + install -Dm644 src/argparser.h "$(DESTDIR)$(INCLUDE)/argparser.h" install-license: install -d "$(DESTDIR)$(LICENSES)/$(PKGNAME)" @@ -78,17 +80,18 @@ install-license: uninstall: uninstall-python uninstall-bash uninstall-java uninstall-c uninstall-license uninstall-python: - rm -- "$(DESTDIR)$(LIBPY3)/argparser.py" + rm -- "$(DESTDIR)$(PREFIX)$(LIBPY3)/argparser.py" uninstall-bash: - rm -- "$(DESTDIR)$(LIBBASH)/argparser.bash" + rm -- "$(DESTDIR)$(PREFIX)$(LIBBASH)/argparser.bash" uninstall-java: - rm -- "$(DESTDIR)$(LIBJAVA)/ArgParser.jar" + rm -- "$(DESTDIR)$(PREFIX)$(LIBJAVA)/ArgParser.jar" uninstall-c: - rm -- "$(DESTDIR)$(LIB)/argparser.so" - rm -- "$(DESTDIR)$(LIB)/argparser.so.1.0" + rm -- "$(DESTDIR)$(PREFIX)$(LIB)/argparser.so" + rm -- "$(DESTDIR)$(PREFIX)$(LIB)/argparser.so.1.0" + rm -- "$(DESTDIR)$(PREFIX)$(INCLUDE)/argparser.h" uninstall-license: rm -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/LICENSE" -- cgit v1.2.3-70-g09d2