41 lines
1.5 KiB
Diff
41 lines
1.5 KiB
Diff
|
diff -ru camlimages-2.2.old/Makefile camlimages-2.2/Makefile
|
||
|
|
--- camlimages-2.2.old/Makefile 2004-10-03 04:49:05.000000000 +1300
|
||
|
|
+++ camlimages-2.2/Makefile 2007-05-04 09:55:10.000000000 +1200
|
||
|
|
@@ -92,15 +92,15 @@
|
||
|
|
installopt: install
|
||
|
|
|
||
|
|
install: all
|
||
|
|
- mkdir -p $(LIBDIR)
|
||
|
|
+ mkdir -p $(DESTDIR)$(LIBDIR)
|
||
|
|
if test -w $(CAMLDIR)/ld.conf \
|
||
|
|
&& test `grep -s -c '^$(LIBDIR)$$' $(CAMLDIR)/ld.conf` = 0; then \
|
||
|
|
echo $(LIBDIR) >> $(CAMLDIR)/ld.conf; \
|
||
|
|
fi
|
||
|
|
- for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install) || exit $$?; done
|
||
|
|
- $(CP) Makefile.config $(LIBDIR)
|
||
|
|
- $(CP) config.h $(LIBDIR)
|
||
|
|
- $(RANLIB) $(LIBDIR)/*.a
|
||
|
|
+ for i in $(BUILDDIRS); do (cd $$i; $(MAKE) install DESTDIR=$(DESTDIR)) || exit $$?; done
|
||
|
|
+ $(CP) Makefile.config $(DESTDIR)$(LIBDIR)
|
||
|
|
+ $(CP) config.h $(DESTDIR)$(LIBDIR)
|
||
|
|
+ $(RANLIB) $(DESTDIR)$(LIBDIR)/*.a
|
||
|
|
|
||
|
|
depend:
|
||
|
|
for i in $(BUILDDIRS); do (cd $$i; $(MAKE) depend) || exit $$?; done
|
||
|
|
diff -ru camlimages-2.2.old/Makefile.shared camlimages-2.2/Makefile.shared
|
||
|
|
--- camlimages-2.2.old/Makefile.shared 2004-10-03 03:20:09.000000000 +1300
|
||
|
|
+++ camlimages-2.2/Makefile.shared 2007-05-04 09:53:32.000000000 +1200
|
||
|
|
@@ -45,8 +45,10 @@
|
||
|
|
rm -f *.cm[iox] *.o *.cma *.cmxa *.a *.so *~
|
||
|
|
|
||
|
|
install:: all
|
||
|
|
- - mkdir -p $(LIBDIR)
|
||
|
|
- - cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a *.so $(LIBDIR)
|
||
|
|
+ - mkdir -p $(DESTDIR)$(LIBDIR)
|
||
|
|
+ - mkdir -p $(DESTDIR)$(CAMLDIR)/stublibs
|
||
|
|
+ - cp -p *.mli *.cm[iox] *.o *.cma *.cmxa *.a $(DESTDIR)$(LIBDIR)
|
||
|
|
+ - cp -p *.so $(DESTDIR)$(CAMLDIR)/stublibs
|
||
|
|
|
||
|
|
#######
|
||
|
|
|