Rework the Makefile for cleaner installation, redo the debian packaging administration files for better lib/dev files splitting, move the Ivy header files to a new Ivy/ subdir to avoid conflicts with other existing system headers (beware, that *will* break existing code that needs to look in the the new path for headers inclusion)

14 files changed, 171 insertions, 155 deletions

diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index 7f3e616..d334307 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,29 @@
 Source: ivy-c
-Section: devel
 Priority: extra
+Section: devel
 Maintainer: Yannick Jestin <jestin@cena.fr>
-Standards-Version: 3.1.1.1
+Build-Depends: debhelper (>> 4.0.0)
+Standards-Version: 3.6.1
 
-Package: ivy-c
+Package: ivy-c-dev
+Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}
-Build-Depends: debhelper, libc6-dev, xlibs-dev, tcl8.4-dev, libgtk1.2-dev, libpcre3-dev
+Depends: ivy-c (= ${Source-Version}), libc6-dev, xlibs-dev, libgtk1.2-dev
 Suggests: tclsh, wish
-Conflicts: ivy-tcl
-Description: Ivy software bus. runtime Package
+Description: Ivy software bus. development Package
+ This package is needed for compiling applications using ivy-c.
  Ivy is mostly a communication convention between processes, implemented
- through a collection of libraries in several languages and for several platforms:
+ through a collection of libraries in several languages and for several platforms,
  from  C to Perl, from Macintosh or WindowsNT to Linux or Unix.
 
-Package: ivy-c-dev
+Package: ivy-c
+Section: libs
 Architecture: any
-Depends: ivy-c (>= 3.2-3), libc6-dev, xlibs-dev, libgtk1.2-dev
+Depends: ${shlibs:Depends}
+Build-Depends: debhelper, libc6-dev, xlibs-dev, tcl8.4-dev, libgtk1.2-dev, libpcre3-dev
 Suggests: tclsh, wish
-Description: Ivy software bus. development Package
- This package is needed for compiling applications using ivy-c.
+Conflicts: ivy-tcl
+Description: Ivy software bus. runtime Package
  Ivy is mostly a communication convention between processes, implemented
  through a collection of libraries in several languages and for several platforms:
  from  C to Perl, from Macintosh or WindowsNT to Linux or Unix.
diff --git a/debian/dirs b/debian/dirs
index e09a7e3..6593239 100644
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,7 +1,4 @@
-usr/man/man1
+usr/X11R6/lib
 usr/lib
 usr/bin
-usr/X11R6/lib
-usr/X11R6/bin
-usr/include
-usr/man/man3
+usr/man/man1
diff --git a/debian/ivy-c-dev.dirs b/debian/ivy-c-dev.dirs
new file mode 100644
index 0000000..4cfc12a
--- /dev/null
+++ b/debian/ivy-c-dev.dirs
@@ -0,0 +1,2 @@
+usr/X11R6/lib
+usr/lib
diff --git a/debian/ivy-c-dev.files b/debian/ivy-c-dev.files
deleted file mode 100644
index 73fa322..0000000
--- a/debian/ivy-c-dev.files
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/include
-usr/lib/libivy.a
-usr/lib/libivy.so
-usr/lib/libgivy.a
-usr/lib/libgivy.so
-usr/lib/libtclivy.a
-usr/lib/libtclivy.so
-usr/X11R6/lib/libxtivy.a
-usr/X11R6/lib/libxtivy.so
diff --git a/debian/ivy-c-dev.install b/debian/ivy-c-dev.install
new file mode 100644
index 0000000..d73b978
--- /dev/null
+++ b/debian/ivy-c-dev.install
@@ -0,0 +1,8 @@
+usr/lib/*.so
+usr/lib/*.a
+usr/lib/*.la
+usr/X11R6/lib/*.so
+usr/X11R6/lib/*.a
+usr/X11R6/lib/*.la
+usr/include/Ivy/*.h
+usr/lib/pkgconfig/*
diff --git a/debian/ivy-c.dirs b/debian/ivy-c.dirs
new file mode 100644
index 0000000..6593239
--- /dev/null
+++ b/debian/ivy-c.dirs
@@ -0,0 +1,4 @@
+usr/X11R6/lib
+usr/lib
+usr/bin
+usr/man/man1
diff --git a/debian/ivy-c.install b/debian/ivy-c.install
new file mode 100644
index 0000000..38010b3
--- /dev/null
+++ b/debian/ivy-c.install
@@ -0,0 +1,4 @@
+usr/X11R6/lib/*.so.*
+usr/lib/*.so.*
+usr/bin/*
+usr/man/man1/*
diff --git a/debian/rules b/debian/rules
index e78e6a8..53bb2f6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,77 +2,69 @@
 # Made with the aid of debmake, by Christoph Lameter,
 # based on the sample debian/rules file for GNU hello by Ian Jackson.
 
+# Uncomment this to turn on verbose mode.
+export DH_VERBOSE=1
+
 SED_COMMAND='s/.*(\([^)]*\)).*/\1/p'
 MAJOR := $(shell sed -n $(SED_COMMAND) debian/changelog | head -1 | sed -n 's/\([0-9]*\)\..*/\1/p')
 MINOR := $(shell sed -n $(SED_COMMAND) debian/changelog | head -1 | sed -n 's/[0-9]*\.\([0-9\.]*\).*/\1/p')
 
-package=ivy-c
+configure: configure-stamp
+configure-stamp:
+	dh_testdir
+	# Add here commands to configure the package.
+	touch configure-stamp
 
-build:
-	$(checkdir)
-	cd src && make all MAJOR=$(MAJOR) MINOR=$(MINOR) TCLINC=$(-I/usr/include/tcl8.3/) TCLLIB=$(-ltcl8.3) CFLAGS="-g -fPIC -D_REENTRANT"
-	touch build
+build: build-stamp
+build-stamp: configure-stamp 
+	dh_testdir
+	cd src && $(MAKE) all MAJOR=$(MAJOR) MINOR=$(MINOR) TCLINC=$(-I/usr/include/tcl8.3/) TCLLIB=$(-ltcl8.3) CFLAGS="-g -fPIC -D_REENTRANT"
+	touch build-stamp
 
 clean:
-	$(checkdir)
-	-rm -f build
-	-rm -rf debian/tmp debian/*~ debian/copyright `find debian/* -type d ! -name CVS` debian/files* core
-	-rm -f debian/*substvars
-	cd src && make clean
-
-binary-indep:	checkroot build
-	$(checkdir)
-# There are no architecture-independent files to be uploaded
-# generated by this package.  If there were any they would be
-# made here.
-
-binary-arch:	checkroot build 
-	$(checkdir)
-	-rm -rf debian/tmp `find debian/* -type d ! -name CVS`
-	install -d debian/tmp
-	cd debian/tmp && install -d `cat ../dirs`
-
-	cd src && make installlibs PREFIX=`pwd`/../debian/tmp MAJOR=$(MAJOR) MINOR=$(MINOR)
-	cd src && make installbins PREFIX=`pwd`/../debian/tmp
-	cd src && make installdocs PREFIX=`pwd`/../debian/tmp
-
-	-rm debian/tmp/usr/include/list.h # it's yet in utils-c-dev
-	-cp src/version.h debian/copyright
-	#dh_strip debian/tmp/usr/lib/libivy.so.$(MAJOR).$(MINOR)
-	strip debian/tmp/usr/lib/libivy.so.$(MAJOR).$(MINOR)
-	#dh_strip debian/tmp/usr/lib/libtclivy.so.$(MAJOR).$(MINOR)
-	strip debian/tmp/usr/lib/libtclivy.so.$(MAJOR).$(MINOR)
-	#dh_strip debian/tmp/usr/X11R6/lib/libxtivy.so.$(MAJOR).$(MINOR)
-	strip debian/tmp/usr/X11R6/lib/libxtivy.so.$(MAJOR).$(MINOR)
-
-	dh_link usr/lib/libivy.so.$(MAJOR).$(MINOR) usr/lib/libivy.so.$(MAJOR)
-	dh_link usr/lib/libgivy.so.$(MAJOR).$(MINOR) usr/lib/libgivy.so.$(MAJOR)
-	dh_link usr/lib/libtclivy.so.$(MAJOR).$(MINOR) usr/lib/libtclivy.so.$(MAJOR)
-	dh_link usr/X11R6/lib/libxtivy.so.$(MAJOR).$(MINOR) usr/X11R6/lib/libxtivy.so.$(MAJOR)
-	dh_link usr/lib/libivy.so.$(MAJOR).$(MINOR) usr/lib/libivy.so
-	dh_link usr/lib/libgivy.so.$(MAJOR).$(MINOR) usr/lib/libgivy.so
-	dh_link usr/lib/libtclivy.so.$(MAJOR).$(MINOR) usr/lib/libtclivy.so
-	dh_link usr/X11R6/lib/libxtivy.so.$(MAJOR).$(MINOR) usr/X11R6/lib/libxtivy.so
-
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp configure-stamp
+	cd src && $(MAKE) clean
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	cd src && $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+
+binary-indep: build install
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+	dh_install --source=$(CURDIR)/debian/tmp
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
 	dh_fixperms
-
-	debstd doc/man-ivy-c.html doc/ivy-c-*.html
-
-	-rmdir debian/tmp/usr/include
-
-	dpkg-gencontrol -p$(package) -isp
-	dpkg --build debian/tmp ..
-
-define checkdir
-	test -f debian/rules
-endef
-
-# Below here is fairly generic really
-
-binary:		binary-indep binary-arch
-
-checkroot:
-	$(checkdir)
-	test root = "`whoami`"
-
-.PHONY: binary binary-arch binary-indep clean checkroot
+#	dh_perl
+#	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/substvars b/debian/substvars
new file mode 100644
index 0000000..dc83102
--- /dev/null
+++ b/debian/substvars
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.3.2.ds1-21), libglib2.0-0 (>= 2.6.0), libice6, libpcre3 (>= 4.5), libsm6, libx11-6, libxt6
diff --git a/examples/gtkIvyButton.c b/examples/gtkIvyButton.c
index aba5ea7..e4c7a1a 100644
--- a/examples/gtkIvyButton.c
+++ b/examples/gtkIvyButton.c
@@ -1,8 +1,8 @@
-#include <gtk/gtk.h>
-#include <ivy.h>
-#include <ivyglibloop.h>
 #include <stdio.h>
 #include <stdlib.h>
+#include <gtk/gtk.h>
+#include <Ivy/ivy.h>
+#include <Ivy/ivyglibloop.h>
 
 
 
diff --git a/examples/motifButtonIvy.c b/examples/motifButtonIvy.c
index 084359f..cebc292 100644
--- a/examples/motifButtonIvy.c
+++ b/examples/motifButtonIvy.c
@@ -2,8 +2,8 @@
 #include <stdio.h>
 #include <strings.h>
 #include <Xm/PushB.h>
-#include <ivy.h>
-#include <ivyxtloop.h>
+#include <Ivy/ivy.h>
+#include <Ivy/ivyxtloop.h>
 
 void myMotifCallback(Widget w,XtPointer client_d,XtPointer call_d){
   // sends the string on the bus
diff --git a/examples/testUnbind.c b/examples/testUnbind.c
index 16a4a8a..e302a0f 100644
--- a/examples/testUnbind.c
+++ b/examples/testUnbind.c
@@ -13,8 +13,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <ivyloop.h>
-#include <ivy.h>
+#include <Ivy/ivyloop.h>
+#include <Ivy/ivy.h>
 #define REGEXP "^ub"
 
 void Callback (IvyClientPtr app, void *user_data, int argc, char *argv[]) {
diff --git a/src/Makefile b/src/Makefile
index c44eafa..3b1a796 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -4,11 +4,11 @@
 #	Copyright (C) 1997-2002
 #	Centre d'Études de la Navigation Aérienne
 #
-# 	Makefile
+#	Makefile
 #
 #	Authors: François-Régis Colin <fcolin@cena.fr>
-# 		 Stéphane Chatty <chatty@cena.fr>
-# 		 Yannick Jestin <jestin@cena.fr>
+#		 Stéphane Chatty <chatty@cena.fr>
+#		 Yannick Jestin <jestin@cena.fr>
 #
 #	Please refer to file version.h for the
 #	copyright notice regarding this software
@@ -20,18 +20,18 @@ MAJOR=3
 MINOR=8
 
 PERHAPS64 := $(shell uname -m | perl -ne "print /64/ ? '64' : '';")
-LIB = lib$(PERHAPS64)
+LIB = /lib$(PERHAPS64)
 ifeq ($(PERHAPS64), "64")
 	FPIC=
 else
 	FPIC=-fPIC
 endif
 
-INSTALL_BINDIR=$(PREFIX)/usr/local/bin
-INSTALL_LIBDIR=$(PREFIX)/usr/local/$(LIB)
+PREFIX = /usr
+X11_PREFIX = /usr/X11R6
 
-XTINC = -I/usr/X11R6/include
-XTLIB = -L/usr/X11R6/$(LIB) -lXt -lX11 -lSM -lICE
+XTINC = -I$(X11_PREFIX)/include
+XTLIB = -L$(X11_PREFIX)$(LIB) -lXt -lX11 -lSM -lICE
 GLIBINC = `pkg-config --cflags glib-2.0`
 GLIBLIB = `pkg-config --libs glib-2.0`
 GLUTINC = -I/usr/include -I.
@@ -47,12 +47,12 @@ ifndef TCLVERS
 TCLVERS=8.3
 endif
 
-TCLINCL	= -I/usr/include/tcl$(TCLVERS)
+TCLINCL = -I/usr/include/tcl$(TCLVERS)
 TCLLIB = -ltcl$(TCLVERS)
 #TCLINCL	= -I/usr/include/tcl8.4
 #TCLLIB = -ltcl8.4
 # use these if you want to use Aqua Tcl on macOSX
-#TCLINC	= -I/Library/Frameworks/Tcl.framework/Headers
+#TCLINC = -I/Library/Frameworks/Tcl.framework/Headers
 #TCLLIB = -framework Tcl
 PCREINC = `pcre-config --cflags`
 PCRELIB = `pcre-config --libs`
@@ -75,7 +75,7 @@ CC=gcc
 LIBTOOL=ar q # linux and solaris
 #LIBTOOL=libtool -static -o
 
-#REGEXP = -DGNU_REGEXP  -DREGCOMP_OPT=$(REGCOMP_OPT) # deprecated !
+#REGEXP = -DGNU_REGEXP	-DREGCOMP_OPT=$(REGCOMP_OPT) # deprecated !
 REGEXP= -DUSE_PCRE_REGEX -DPCRE_OPT=$(PCRE_OPT)
 # on activeTCL , set #define CHANNEL to null, and add ivyloop.o in the ivytcl target,
 # see below
@@ -210,57 +210,70 @@ clean:
 	-rm -f $(TARGETS) $(TARGETLIBS) *.o *.a *.so *.so.* *~
 
 installlibs: static-libs shared-libs
-	test -d $(INSTALL_LIBDIR) || mkdirhier $(INSTALL_LIBDIR)
-	test -d $(PREFIX)/usr/X11R6/$(LIB) || mkdirhier $(PREFIX)/usr/X11R6/$(LIB)
-	test -d $(PREFIX)/usr/local/include || mkdirhier $(PREFIX)/usr/local/include
-	install -m644 libivy.a $(INSTALL_LIBDIR)
-	install -m644 libgivy.a $(INSTALL_LIBDIR)
-	install -m644 libxtivy.a $(PREFIX)/usr/X11R6/$(LIB)
-	install -m644 libtclivy.a $(INSTALL_LIBDIR)
-	install -m644 libglibivy.a $(INSTALL_LIBDIR)
-
-	install -m644 libivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)
-	install -m644 libgivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)
-	install -m644 libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/$(LIB)
-	install -m644 libtclivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)
-	install -m644 libglibivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)
-
-	install -m644 *.h $(PREFIX)/usr/local/include
+	test -d $(DESTDIR)$(PREFIX)$(LIB)  || mkdirhier $(DESTDIR)$(PREFIX)$(LIB)
+	test -d $(DESTDIR)$(X11_PREFIX)$(LIB)  || mkdirhier $(DESTDIR)$(X11_PREFIX)$(LIB)
+
+	install -m644 libivy.a						$(DESTDIR)$(PREFIX)$(LIB)
+	install -m644 libgivy.a						$(DESTDIR)$(PREFIX)$(LIB)
+	install -m644 libxtivy.a					$(DESTDIR)$(X11_PREFIX)$(LIB)
+	install -m644 libtclivy.a					$(DESTDIR)$(PREFIX)$(LIB)
+	install -m644 libglibivy.a					$(DESTDIR)$(PREFIX)$(LIB)
+
+	install -m644 libivy.so.$(MAJOR).$(MINOR)			$(DESTDIR)$(PREFIX)$(LIB)
+	install -m644 libgivy.so.$(MAJOR).$(MINOR)			$(DESTDIR)$(PREFIX)$(LIB)
+	install -m644 libxtivy.so.$(MAJOR).$(MINOR)			$(DESTDIR)$(X11_PREFIX)$(LIB)
+	install -m644 libtclivy.so.$(MAJOR).$(MINOR)			$(DESTDIR)$(PREFIX)$(LIB)
+	install -m644 libglibivy.so.$(MAJOR).$(MINOR)			$(DESTDIR)$(PREFIX)$(LIB)
+
+	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/
+	install -m644 ivybuffer.h					$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 ivychannel.h					$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 ivydebug.h					$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 ivyglibloop.h					$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 ivyglutloop.h*					$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 ivyloop.h						$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 ivysocket.h					$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 ivytcl.h*						$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 ivyxtloop.h					$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 list.h						$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 timer.h						$(DESTDIR)$(PREFIX)/include/Ivy/
+	install -m644 version.h						$(DESTDIR)$(PREFIX)/include/Ivy/
 
 installliblinks: installlibs
-	ln -fs $(INSTALL_LIBDIR)/libivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libivy.so
-	ln -fs $(INSTALL_LIBDIR)/libivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libivy.so.$(MAJOR)
-	ln -fs $(INSTALL_LIBDIR)/libgivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libgivy.so
-	ln -fs $(INSTALL_LIBDIR)/libgivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libgivy.so.$(MAJOR)
-	ln -fs /usr/X11R6/$(LIB)/libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/$(LIB)/libxtivy.so
-	ln -fs /usr/X11R6/$(LIB)/libxtivy.so.$(MAJOR).$(MINOR) $(PREFIX)/usr/X11R6/$(LIB)/libxtivy.so.$(MAJOR)
-	ln -fs $(INSTALL_LIBDIR)/libtclivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libtclivy.so
-	ln -fs $(INSTALL_LIBDIR)/libtclivy.so.$(MAJOR).$(MINOR) $(INSTALL_LIBDIR)/libtclivy.so.$(MAJOR)
+	ln -fs $(PREFIX)$(LIB)/libivy.so.$(MAJOR).$(MINOR)		$(DESTDIR)$(PREFIX)$(LIB)/libivy.so
+	ln -fs $(PREFIX)$(LIB)/libivy.so.$(MAJOR).$(MINOR)		$(DESTDIR)$(PREFIX)$(LIB)/libivy.so.$(MAJOR)
+	ln -fs $(PREFIX)$(LIB)/libgivy.so.$(MAJOR).$(MINOR)		$(DESTDIR)$(PREFIX)$(LIB)/libgivy.so
+	ln -fs $(PREFIX)$(LIB)/libgivy.so.$(MAJOR).$(MINOR)		$(DESTDIR)$(PREFIX)$(LIB)/libgivy.so.$(MAJOR)
+	ln -fs $(X11_PREFIX)$(LIB)/libxtivy.so.$(MAJOR).$(MINOR)	$(DESTDIR)$(X11_PREFIX)$(LIB)/libxtivy.so
+	ln -fs $(X11_PREFIX)$(LIB)/libxtivy.so.$(MAJOR).$(MINOR)	$(DESTDIR)$(X11_PREFIX)$(LIB)/libxtivy.so.$(MAJOR)
+	ln -fs $(PREFIX)$(LIB)/libtclivy.so.$(MAJOR).$(MINOR)		$(DESTDIR)$(PREFIX)$(LIB)/libtclivy.so
+	ln -fs $(PREFIX)$(LIB)/libtclivy.so.$(MAJOR).$(MINOR)		$(DESTDIR)$(PREFIX)$(LIB)/libtclivy.so.$(MAJOR)
 
 installbins: commands
-	test -d $(INSTALL_BINDIR) || mkdirhier $(INSTALL_BINDIR)
-	test -d $(PREFIX)/usr/X11R6/bin || mkdirhier $(PREFIX)/usr/X11R6/bin
-	install -m755 ivyprobe $(INSTALL_BINDIR)
-	#install -m755 ivyxtprobe $(PREFIX)/usr/X11R6/bin
-	#install -m755 ivyglibprobe $(INSTALL_BINDIR)
-	#install -m755 ivyglutprobe $(PREFIX)/usr/X11R6/bin
+	test -d $(DESTDIR)$(PREFIX)/bin || mkdirhier $(DESTDIR)$(PREFIX)/bin
+	install -m755 ivyprobe $(DESTDIR)$(PREFIX)/bin
+	#install -m755 ivyxtprobe $(DESTDIR)$(PREFIX)/bin
+	#install -m755 ivyglibprobe $(DESTDIR)$(PREFIX)/bin
+	#install -m755 ivyglutprobe $(DESTDIR)$(PREFIX)/bin
 
 installdocs:
-	test -d $(PREFIX)/usr/share/doc/ivy-c || mkdirhier $(PREFIX)/usr/share/doc/ivy-c
-	for f in `find  ../doc/*.html -type f -maxdepth 1`; do \
-                install -m 644 $$f $(PREFIX)/usr/share/doc/ivy-c; \
-        done
-	test -d $(PREFIX)/usr/man/man1 || mkdirhier $(PREFIX)/usr/man/man1
-	for f in `find  ../doc/*.1 -type f -maxdepth 1`; do \
-                install -m 644 $$f $(PREFIX)/usr/man/man1; \
-        done
-	test -d $(PREFIX)/usr/share/doc/ivy-c/examples || mkdirhier $(PREFIX)/usr/share/doc/ivy-c/examples
-	install -m 644 version.h $(PREFIX)/usr/share/doc/ivy-c/copyright
-	install -m 644 ../examples/motifButtonIvy.c $(PREFIX)/usr/share/doc/ivy-c/examples
-	install -m 644 ../examples/testUnbind.c $(PREFIX)/usr/share/doc/ivy-c/examples
-	install -m 766 ../examples/Test.tcl $(PREFIX)/usr/share/doc/ivy-c/examples
-	install -m 766 ../examples/button.tk $(PREFIX)/usr/share/doc/ivy-c/examples
-	install -m 766 ../examples/unBind.tcl $(PREFIX)/usr/share/doc/ivy-c/examples
+	test -d $(DESTDIR)$(PREFIX)/share/doc/ivy-c || mkdirhier $(DESTDIR)$(PREFIX)/share/doc/ivy-c
+	for f in `find	../doc/*.html -type f -maxdepth 1`; do \
+		install -m 644 $$f					$(DESTDIR)$(PREFIX)/share/doc/ivy-c; \
+	done
+	test -d $(DESTDIR)$(PREFIX)/man/man1 || mkdirhier $(DESTDIR)$(PREFIX)/man/man1
+	for f in `find	../doc/*.1 -type f -maxdepth 1`; do \
+		install -m 644 $$f					$(DESTDIR)$(PREFIX)/man/man1; \
+	done
+	test -d $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples || mkdirhier $(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples
+	install -m 644 version.h					$(DESTDIR)$(PREFIX)/share/doc/ivy-c/copyright
+	install -m 644 ../examples/motifButtonIvy.c			$(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples
+	install -m 644 ../examples/testUnbind.c				$(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples
+	install -m 766 ../examples/Test.tcl				$(DESTDIR)$(PREFIX)/share/doc/ivy-c/examples
+	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