pool/ocaml-findlib
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- add DESTDIR support

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/devel:languages:ocaml/ocaml-findlib?expand=0&rev=8
This commit is contained in:
Olaf Hering 2012-11-13 20:41:05 +00:00 committed by Git OBS Bridge
parent 2d5bcbc99e
commit 4eafb592d0
3 changed files with 141 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
findlib-1.3.3.patch Normal file
View File

@ -0,0 +1,132 @@
---
Makefile | 32 ++++++++++++++++----------------
src/findlib-toolbox/Makefile | 2 +-
src/findlib/Makefile | 22 +++++++++++-----------
3 files changed, 28 insertions(+), 28 deletions(-)
Index: findlib-1.3.3/Makefile
===================================================================
--- findlib-1.3.3.orig/Makefile
+++ findlib-1.3.3/Makefile
@@ -17,13 +17,13 @@ opt:
for p in $(PARTS); do ( cd src/$$p; $(MAKE) opt ); done
install:
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- mkdir -p "$(prefix)$(OCAMLFIND_MAN)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_MAN)"
for p in $(PARTS); do ( cd src/$$p; $(MAKE) install ); done
$(MAKE) install-meta
cd src/findlib; $(MAKE) install-num-top
$(MAKE) install-config
- cp tools/safe_camlp4 "$(prefix)$(OCAMLFIND_BIN)"
+ cp tools/safe_camlp4 "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
$(MAKE) install-doc
uninstall:
@@ -66,32 +66,32 @@ findlib.conf: findlib.conf.in
.PHONY: install-doc
install-doc:
- mkdir -p $(prefix)$(OCAMLFIND_MAN)/man1 $(prefix)$(OCAMLFIND_MAN)/man3 $(prefix)$(OCAMLFIND_MAN)/man5
- -cp doc/ref-man/ocamlfind.1 $(prefix)$(OCAMLFIND_MAN)/man1
- -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(prefix)$(OCAMLFIND_MAN)/man5
+ mkdir -p $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
+ -cp doc/ref-man/ocamlfind.1 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1
+ -cp doc/ref-man/META.5 doc/ref-man/site-lib.5 doc/ref-man/findlib.conf.5 $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5
.PHONY: uninstall-doc
uninstall-doc:
- rm -f $(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1
- rm -f $(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3
- rm -f $(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3
- rm -f $(prefix)$(OCAMLFIND_MAN)/man5/META.5
- rm -f $(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man1/ocamlfind.1
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Findlib.3
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man3/Topfind.3
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/META.5
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_MAN)/man5/site-lib.5
.PHONY: install-meta
install-meta:
- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" -a -f "site-lib-src/$$x/META" ]; then mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; cp site-lib-src/$$x/META "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
.PHONY: uninstall-meta
uninstall-meta:
- for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf "$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
+ for x in `ls site-lib-src`; do if [ "$$x" != "CVS" ]; then rm -rf "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$$x"; fi; done
.PHONY: install-config
install-config:
- mkdir -p "`dirname \"$(prefix)$(OCAMLFIND_CONF)\"`"
- @if [ -f "$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(prefix)$(OCAMLFIND_CONF) !!!"; fi
- test -f "$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(prefix)$(OCAMLFIND_CONF)"
+ mkdir -p "`dirname \"$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)\"`"
+ @if [ -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" ]; then echo "!!! Keeping old $(DESTDIR)$(prefix)$(OCAMLFIND_CONF) !!!"; fi
+ test -f "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)" || cp findlib.conf "$(DESTDIR)$(prefix)$(OCAMLFIND_CONF)"
.PHONY: uninstall-config
uninstall-config:
Index: findlib-1.3.3/src/findlib-toolbox/Makefile
===================================================================
--- findlib-1.3.3.orig/src/findlib-toolbox/Makefile
+++ findlib-1.3.3/src/findlib-toolbox/Makefile
@@ -13,7 +13,7 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m
findlib.cma make_wizard.ml
install:
- cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib
+ cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib
# uninstall: Nothing to do, because the removal of the findlib core also
# deinstalls the make_wizard
Index: findlib-1.3.3/src/findlib/Makefile
===================================================================
--- findlib-1.3.3.orig/src/findlib/Makefile
+++ findlib-1.3.3/src/findlib/Makefile
@@ -80,30 +80,30 @@ clean:
ocamlfind$(EXEC_SUFFIX) ocamlfind_opt$(EXEC_SUFFIX)
install: all
- mkdir -p "$(prefix)$(OCAML_SITELIB)/$(NAME)"
- mkdir -p "$(prefix)$(OCAMLFIND_BIN)"
- test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(prefix)$(OCAML_CORE_STDLIB)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)"
+ test $(INSTALL_TOPFIND) -eq 0 || cp topfind "$(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)"
files=`$(TOP)/tools/collect_files $(TOP)/Makefile.config findlib.cmi findlib.mli findlib.cma topfind.cmi topfind.mli fl_package_base.mli fl_package_base.cmi fl_metascanner.mli fl_metascanner.cmi fl_metatoken.cmi findlib_top.cma findlib.cmxa findlib.a META` && \
- cp $$files "$(prefix)$(OCAML_SITELIB)/$(NAME)"
+ cp $$files "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)"
f="ocamlfind$(EXEC_SUFFIX)"; { test -f ocamlfind_opt$(EXEC_SUFFIX) && f="ocamlfind_opt$(EXEC_SUFFIX)"; }; \
- cp $$f "$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
+ cp $$f "$(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)"
# the following "if" block is only needed for 4.00beta2
if [ $(OCAML_REMOVE_DIRECTORY) -eq 0 -a -f "$(OCAML_CORE_STDLIB)/compiler-libs/topdirs.cmi" ]; then \
cd "$(OCAML_CORE_STDLIB)/compiler-libs/"; \
- cp topdirs.cmi toploop.cmi "$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
+ cp topdirs.cmi toploop.cmi "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)/"; \
fi
install-num-top:
- mkdir -p "$(prefix)$(OCAML_SITELIB)/num-top"
+ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
cp num_top.cma num_top.cmi num_top_printers.cmi \
- "$(prefix)$(OCAML_SITELIB)/num-top"
+ "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/num-top"
# Note: uninstall-num-top is part of the removal of the META files.
uninstall:
- rm -f $(prefix)$(OCAML_CORE_STDLIB)/findlib
- rm -rf $(prefix)$(OCAML_SITELIB)/$(NAME)
- rm -f $(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
+ rm -f $(DESTDIR)$(prefix)$(OCAML_CORE_STDLIB)/findlib
+ rm -rf $(DESTDIR)$(prefix)$(OCAML_SITELIB)/$(NAME)
+ rm -f $(DESTDIR)$(prefix)$(OCAMLFIND_BIN)/ocamlfind$(EXEC_SUFFIX)
depend: *.ml *.mli fl_meta.ml fl_metascanner.ml

5
ocaml-findlib.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Nov 13 21:40:32 CET 2012 - ohering@suse.de
- add DESTDIR support
-------------------------------------------------------------------
Tue Sep 18 15:38:11 CEST 2012 - ohering@suse.de

12
ocaml-findlib.spec
View File

@ -48,8 +48,9 @@ Group: Development/Libraries/Other
Url: http://projects.camlcity.org/projects/findlib.html
Source0: http://download.camlcity.org/download/findlib-%{version}.tar.gz
Patch0: findlib-1.3.3.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExcludeArch: sparc64 s390 s390x
ExclusiveArch: %ix86 x86_64
Provides: ocamlfind = %{version}
@ -81,6 +82,7 @@ developing applications that use %{name}.
%prep
%setup -q -n findlib-%{version}
%patch0 -p1
%build
(cd tools/extract_args && make)
@ -98,13 +100,7 @@ make opt
rm doc/guide-html/TIMESTAMP
%install
rm -rf $RPM_BUILD_ROOT
# Grrr destdir grrrr
mkdir -p $RPM_BUILD_ROOT%{_bindir}
make install prefix=$RPM_BUILD_ROOT OCAMLFIND_BIN=$RPM_BUILD_ROOT%{_bindir}
mv $RPM_BUILD_ROOT/$RPM_BUILD_ROOT%{_bindir}/* $RPM_BUILD_ROOT%{_bindir}
strip $RPM_BUILD_ROOT%{_bindir}/ocamlfind
make install DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT