Further fix up Makefile

3 files changed, 17 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7d230ff2c149..d5db743be857 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = libbulletml
 	pkgdesc = C++ library to handle BulletML, a markup language to describe bullets in shooting games.
 	pkgver = 0.0.6
-	pkgrel = 4
+	pkgrel = 5
 	url = http://shinh.skr.jp/libbulletml/index_en.html
 	arch = x86_64
 	arch = i686
@@ -14,7 +14,7 @@ pkgbase = libbulletml
 	sha256sums = 7c37f3d2d52825417c5de716f89bea4b71156371e698e2579daf7921df07aa79
 	sha256sums = f0a9f01ef9daaa980f876253c81e8e76eea17b7de1aa569bf23661b456c5c9d3
 	sha256sums = e85182a82604b4bc3c3f42b35f5d77decd327239602bcc4b5ac3a2e1269f211e
-	sha256sums = ce5f9d510b81f6a7141408ca2c3c80d86dc7d371098696965d752381b7fdeba9
+	sha256sums = 061c2e980e72b151fe2fc26a5b083f82a4403d6cd788aadba96e27f78810d24d
 
 pkgname = libbulletml
 
diff --git a/Makefile b/Makefile
index 2de5f08a1314..dbddde8b63fb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,8 +5,8 @@ CFLAGS ?= -O2
 prefix ?= /usr/local
 VDIR = tinyxml
 
-includedir ?= include
-libdir ?= lib
+includedir ?= $(prefix)/include
+libdir ?= $(prefix)/lib
 
 MAJOR=0d2
 MINOR=0
@@ -42,17 +42,18 @@ doxy:
 	doxygen
 
 install: all
-	install -D -m 644 bulletml.d $(DESTDIR)/$(prefix)/$(includedir)/d/bulletml.d
-	install -D -m 644 tinyxml/tinyxml.h $(DESTDIR)/$(prefix)/$(includedir)/bulletml/tinyxml/tinyxml.h
-	install -m 644 *.h $(DESTDIR)/$(prefix)/$(includedir)/bulletml
-	install -d $(DESTDIR)/$(prefix)/$(libdir)
-	install -m 644 libbulletml.a $(DESTDIR)/$(prefix)/$(libdir)
-	install -m 644 libbulletml.so.$(MAJOR).$(MINOR) $(DESTDIR)/$(prefix)/$(libdir)
+	install -D -m 644 bulletml.d $(DESTDIR)/$(includedir)/d/bulletml.d
+	install -D -m 644 tinyxml/tinyxml.h \
+		$(DESTDIR)/$(includedir)/bulletml/tinyxml/tinyxml.h
+	install -m 644 *.h $(DESTDIR)/$(includedir)/bulletml
+	install -d $(DESTDIR)/$(libdir)
+	install -m 644 libbulletml.a $(DESTDIR)/$(libdir)
+	install -m 644 libbulletml.so.$(MAJOR).$(MINOR) $(DESTDIR)/$(libdir)
 	ln -f -r -s \
-		$(DESTDIR)/$(prefix)/$(libdir)/libbulletml.so.$(MAJOR).$(MINOR) \
-		$(DESTDIR)/$(prefix)/$(libdir)/libbulletml.so.$(MAJOR)
+		$(DESTDIR)/$(libdir)/libbulletml.so.$(MAJOR).$(MINOR) \
+		$(DESTDIR)/$(libdir)/libbulletml.so.$(MAJOR)
 	ln -f -r -s \
-		$(DESTDIR)/$(prefix)/$(libdir)/libbulletml.so.$(MAJOR).$(MINOR) \
-		$(DESTDIR)/$(prefix)/$(libdir)/libbulletml.so
+		$(DESTDIR)/$(libdir)/libbulletml.so.$(MAJOR).$(MINOR) \
+		$(DESTDIR)/$(libdir)/libbulletml.so
 
 PHONY: all clean doxy install
diff --git a/PKGBUILD b/PKGBUILD
index 63502676799a..32a3992f60f8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=libbulletml
 pkgver=0.0.6
-pkgrel=4
+pkgrel=5
 pkgdesc='C++ library to handle BulletML, a markup language to describe bullets in shooting games.'
 url='http://shinh.skr.jp/libbulletml/index_en.html'
 license=('custom:libbulletml')
@@ -21,7 +21,7 @@ sha256sums=(
 	7c37f3d2d52825417c5de716f89bea4b71156371e698e2579daf7921df07aa79
 	f0a9f01ef9daaa980f876253c81e8e76eea17b7de1aa569bf23661b456c5c9d3
 	e85182a82604b4bc3c3f42b35f5d77decd327239602bcc4b5ac3a2e1269f211e
-	ce5f9d510b81f6a7141408ca2c3c80d86dc7d371098696965d752381b7fdeba9
+	061c2e980e72b151fe2fc26a5b083f82a4403d6cd788aadba96e27f78810d24d
 )
 noextract=(d_cpp.tar.bz2)