--- Makefile.in.orig	2011-05-25 09:07:28 UTC
+++ Makefile.in
@@ -389,18 +389,18 @@ MLI = camomileLibrary.mli camomileLibrar
 install: $(INSTALL) install-data
 
 install-without-ocamlfind:
-	mkdir -p $(OCAMLLIB)
-	cp -f camomileLibrary.cmi '$(OCAMLLIB)'
-	cp -f camomileLibraryDefault.cmi '$(OCAMLLIB)'	
-	cp -f camomileLibraryDyn.cmi '$(OCAMLLIB)'	
-	if [ -f camomileLibrary.cmx ]; then cp -f camomileLibrary.cmx '$(OCAMLLIB)'; fi
-	if [ -f camomileLibrary.cma ]; then cp -f camomileLibrary.cma '$(OCAMLLIB)'; fi
-	if [ -f camomileLibrary.cmxa ]; then cp -f camomileLibrary.cmxa '$(OCAMLLIB)'; fi
-	if [ -f camomileLibraryDefault.cmx ]; then cp -f camomileLibraryDefault.cmx '$(OCAMLLIB)'; fi
-	if [ -f camomileLibraryDyn.cmx ]; then cp -f camomileLibraryDyn.cmx '$(OCAMLLIB)'; fi
-	if [ -f camomile.cma ]; then cp -f camomile.cma '$(OCAMLLIB)'; fi
-	if [ -f camomile.cmxa ]; then cp -f camomile.cmxa '$(OCAMLLIB)'; fi
-	if [ -f camomile.a ]; then cp -f camomile.a '$(OCAMLLIB)'; fi
+	mkdir -p '$(DESTDIR)$(OCAMLLIB)'
+	${BSD_INSTALL_LIB} camomileLibrary.cmi '$(DESTDIR)$(OCAMLLIB)'
+	${BSD_INSTALL_LIB} camomileLibraryDefault.cmi '$(DESTDIR)$(OCAMLLIB)'
+	${BSD_INSTALL_LIB} camomileLibraryDyn.cmi '$(DESTDIR)$(OCAMLLIB)'
+	if [ -f camomileLibrary.cmx ]; then ${BSD_INSTALL_DATA} camomileLibrary.cmx '$(DESTDIR)$(OCAMLLIB)'; fi
+	if [ -f camomileLibrary.cma ]; then ${BSD_INSTALL_DATA} camomileLibrary.cma '$(DESTDIR)$(OCAMLLIB)'; fi
+	if [ -f camomileLibrary.cmxa ]; then ${BSD_INSTALL_DATA} camomileLibrary.cmxa '$(DESTDIR)$(OCAMLLIB)'; fi
+	if [ -f camomileLibraryDefault.cmx ]; then ${BSD_INSTALL_DATA} camomileLibraryDefault.cmx '$(DESTDIR)$(OCAMLLIB)'; fi
+	if [ -f camomileLibraryDyn.cmx ]; then ${BSD_INSTALL_DATA} camomileLibraryDyn.cmx '$(DESTDIR)$(OCAMLLIB)'; fi
+	if [ -f camomile.cma ]; then ${BSD_INSTALL_DATA} camomile.cma '$(DESTDIR)$(OCAMLLIB)'; fi
+	if [ -f camomile.cmxa ]; then ${BSD_INSTALL_DATA} camomile.cmxa '$(DESTDIR)$(OCAMLLIB)'; fi
+	if [ -f camomile.a ]; then ${BSD_INSTALL_DATA} camomile.a '$(DESTDIR)$(OCAMLLIB)'; fi
 
 install-with-ocamlfind:
 	files= &&\
@@ -415,16 +415,14 @@ install-with-ocamlfind:
 	ocamlfind install camomile $$files META $(MLI) camomileLibrary.cmi camomileLibraryDefault.cmi camomileLibraryDyn.cmi
 
 install-data:
-	mkdir -p '$(DATADIR)'
-	mkdir -p '$(DATADIR)'/camomile
-	mkdir -p '$(DATADIR)'/camomile/database
-	cp -f database/*.mar '$(DATADIR)'/camomile/database || true
-	mkdir -p '$(DATADIR)'/camomile/charmaps
-	cp -f charmaps/*.mar '$(DATADIR)'/camomile/charmaps || true
-	mkdir -p '$(DATADIR)'/camomile/mappings
-	cp -f mappings/*.mar '$(DATADIR)'/camomile/mappings || true
-	mkdir -p '$(DATADIR)'/camomile/locales
-	cp -f locales/*.mar '$(DATADIR)'/camomile/locales || true
+	mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/database
+	${BSD_INSTALL_DATA} database/*.mar '$(DESTDIR)$(DATADIR)'/camomile/database || true
+	mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/charmaps
+	${BSD_INSTALL_DATA} charmaps/*.mar '$(DESTDIR)$(DATADIR)'/camomile/charmaps || true
+	mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/mappings
+	${BSD_INSTALL_DATA} mappings/*.mar '$(DESTDIR)$(DATADIR)'/camomile/mappings || true
+	mkdir -p '$(DESTDIR)$(DATADIR)'/camomile/locales
+	${BSD_INSTALL_DATA} locales/*.mar '$(DESTDIR)$(DATADIR)'/camomile/locales || true
 
 uninstall: $(UNINSTALL)