From 1f3c03814fc2939a234232229a7127cdc706c470 Mon Sep 17 00:00:00 2001
From: fourdan
Date: Fri, 2 Jun 2006 07:41:56 +0000
Subject: Fix proper installation PATH, set PREFIX if not set.

---
 debian/ivy-c-dev.dirs | 1 +
 debian/rules          | 2 +-
 src/Makefile          | 8 ++++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/ivy-c-dev.dirs b/debian/ivy-c-dev.dirs
index 4cfc12a..ad9ae40 100644
--- a/debian/ivy-c-dev.dirs
+++ b/debian/ivy-c-dev.dirs
@@ -1,2 +1,3 @@
+usr/include/Ivy
 usr/X11R6/lib
 usr/lib
diff --git a/debian/rules b/debian/rules
index 53bb2f6..44ee736 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ install: build
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-	cd src && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	cd src && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp PREFIX=/usr
 
 binary-indep: build install
 binary-arch: build install
diff --git a/src/Makefile b/src/Makefile
index 1a918f5..753f647 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -27,7 +27,10 @@ else
 	FPIC=-fPIC
 endif
 
-PREFIX = /usr/local
+ifndef PREFIX
+    PREFIX=/usr/local
+endif
+
 X11_PREFIX = /usr/X11R6
 
 XTINC = -I$(X11_PREFIX)/include
@@ -225,6 +228,7 @@ installlibs: static-libs shared-libs
 	install -m644 libtclivy.so.$(MAJOR).$(MINOR)			$(DESTDIR)$(PREFIX)$(LIB)
 	install -m644 libglibivy.so.$(MAJOR).$(MINOR)			$(DESTDIR)$(PREFIX)$(LIB)
 
+includes:
 	test -d $(DESTDIR)$(PREFIX)/include/Ivy || mkdirhier $(DESTDIR)$(PREFIX)/include/Ivy
 	install -m644 ivy.h						$(DESTDIR)$(PREFIX)/include/Ivy/
 	install -m644 ivybind.h						$(DESTDIR)$(PREFIX)/include/Ivy/
@@ -275,7 +279,7 @@ installdocs:
 	install -m 766 ../examples/button.tk				$(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples
 	install -m 766 ../examples/unBind.tcl				$(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples
 
-install: installlibs installbins installliblinks installdocs
+install: installlibs installbins installliblinks installdocs includes
 
 rpm::
 	/usr/bin/rpmize
-- 
cgit v1.1