Sophie

Sophie

distrib > * > 2008.0 > x86_64 > by-pkgid > 0890a981abf81be31e3b650bf7640b49 > files > 1

cduce-0.5.0-2mdv2008.0.src.rpm

diff -Naur cduce-0.4.1/doc/Makefile cduce-0.4.1-destdir/doc/Makefile
--- cduce-0.4.1/doc/Makefile	2006-10-03 11:41:06.000000000 +0200
+++ cduce-0.4.1-destdir/doc/Makefile	2007-02-22 11:44:25.000000000 +0100
@@ -11,4 +11,4 @@
 
 install:
 	@echo "Install man pages"
-	$(HIDE)$(INSTALL) -m644 $(INSTALL_MAN) $(MANDIR)/man1/
+	$(HIDE)$(INSTALL) -m644 $(INSTALL_MAN) $(DESTDIR)$(MANDIR)/man1/
diff -Naur cduce-0.4.1/Makefile cduce-0.4.1-destdir/Makefile
--- cduce-0.4.1/Makefile	2006-10-03 11:43:15.000000000 +0200
+++ cduce-0.4.1-destdir/Makefile	2007-02-22 11:48:48.000000000 +0100
@@ -95,15 +95,15 @@
 
 install_bin:
 	@echo "Install binaries"
-	$(HIDE)mkdir -p $(BINDIR)
-	$(HIDE)$(INSTALL) -m755 $(INSTALL_BINARIES) $(BINDIR)/
+	$(HIDE)mkdir -p $(DESTDIR)$(BINDIR)
+	$(HIDE)$(INSTALL) -m755 $(INSTALL_BINARIES) $(DESTDIR)$(BINDIR)/
 
 
 install_lib:
 	@echo "Build META"
 	$(HIDE)(sed "s/%REQ%/$(PACKAGES)/" < META.in | sed "s/%VER%/$(VERSION)/" > META)
 	$(HIDE)-$(OCAMLFIND) remove cduce
-	$(HIDE)-$(OCAMLFIND) install cduce META \
+	$(HIDE)-$(OCAMLFIND) install $(OCAMLFIND_INSTFLAGS) cduce META \
          cduce_lib.cmi $(wildcard *.cma) $(wildcard *.cmxa) $(wildcard *.a) \
 
 
@@ -310,12 +310,12 @@
 	./cduce -I web/ --compile web/xhtml.cd
 
 install_doc: doc
-	$(HIDE)mkdir -p $(MANDIR)/man1
-	$(HIDE)(cd doc; $(MAKE) install INSTALL="$(INSTALL)" MANDIR=$(MANDIR) HIDE=$(HIDE))
-	mkdir -p $(DOCDIR)/img
-	cp web/doc/*.html $(DOCDIR)/
-	cp CHANGES INSTALL INSTALL.WIN32 README AUTHORS LICENSE $(DOCDIR)/
-	cp web/img/left.gif web/img/right.gif $(DOCDIR)/img
+	$(HIDE)mkdir -p $(DESTDIR)$(MANDIR)/man1
+	$(HIDE)(cd doc; $(MAKE) install INSTALL="$(INSTALL)" MANDIR=$(MANDIR) HIDE=$(HIDE) DESTDIR=$(DESTDIR))
+	mkdir -p $(DESTDIR)$(DOCDIR)/img
+	cp web/doc/*.html $(DESTDIR)$(DOCDIR)/
+	cp CHANGES INSTALL INSTALL.WIN32 README AUTHORS LICENSE $(DESTDIR)$(DOCDIR)/
+	cp web/img/left.gif web/img/right.gif $(DESTDIR)$(DOCDIR)/img
 
 
 ### Pack OCaml modules for the CDuce/OCaml interface