[Pkg-ocaml-maint-commits] [SCM] pkglab packaging branch, master, updated. debian/1.3-1-15-ge4a1429

[Ralf Treinen (none)]

The following commit has been merged in the master branch:
commit 5bc8a8da45903c46280d6def508697967f341c4f
Author: Ralf Treinen <treinen at debian.(none)>
Date:   Mon Apr 20 10:24:04 2009 +0900

    switch back to upstream Makefile

diff --git a/Makefile b/Makefile
index 46c7156..07aae95 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,6 @@ include Makefile.config
 
 OCAMLFIND= ocamlfind 
 PACKAGE=  -linkpkg -package dose2.conduit,dose2.io,dose2.lifetime,dose2.napkin,dose2.packetology,dose2.rapids,ledit
-DESTDIR = /usr/bin
 
 pkglab: dql/dql.cma pkglab.ml
 ifdef	PROFILE
@@ -21,11 +20,10 @@ dql/dql.cmxa:
 	$(MAKE) -C dql dql.cmxa
 
 install:
-	test -d $(DESTDIR) || mkdir -p $(DESTDIR)
 	if [ -x pkglab.opt ] ; then \
-		cp pkglab.opt $(DESTDIR)/pkglab ; \
+		cp pkglab.opt $(BINDIR)/pkglab ; \
 	elif [ -x pkglab ] ; then \
-		cp pkglab $(DESTDIR)/pkglab ; \
+		cp pkglab $(BINDIR)/pkglab ; \
 	else \
 		echo "No executable to install found" ; exit 2 ; \
 	fi

-- 
pkglab packaging