--- Makefile 2016-05-27 16:02:19.934806108 +0200 +++ MakefileArchlinux 2016-05-27 16:01:35.902228473 +0200 @@ -233,7 +233,7 @@ # $documentationprefix/$name installation directory: OTHER_DOCUMENTATION_TO_INSTALL = -# Install the documentation from this package (_build/doc) into $prefix/share/$name: +# Install the documentation from this package (_build/doc) into $prefixInstall/share/$name: install-documentation: META CONFIGME install-documentation-local @($(call READ_CONFIG, documentationprefix); \ $(call READ_META, name); \ @@ -270,11 +270,11 @@ # Just a handy alias: install-doc: install-documentation -# Install the data from this package into $prefix/share/$name: +# Install the data from this package into $prefixInstall/share/$name: install-data: META CONFIGME main install-data-local - @($(call READ_CONFIG, prefix); \ + @($(call READ_CONFIG, prefixInstall); \ $(call READ_META, name); \ - directory=$$prefix/share/$$name; \ + directory=$$prefixInstall/share/$$name; \ shopt -s nullglob; \ if [ -e share ]; then \ dataifany=`ls -d share/*`; \ @@ -344,10 +344,10 @@ # Remove the data of this package from $prefix/share/$name: uninstall-data: META CONFIGME uninstall-data-local - @( ($(call READ_CONFIG, prefix); \ + @( ($(call READ_CONFIG, prefixInstall); \ $(call READ_META, name); \ - directory=$$prefix/share/$$name; \ - echo "Removing $$name data from $$prefix/share/..."; \ + directory=$$prefixInstall/share/$$name; \ + echo "Removing $$name data from $$prefixInstall/share/..."; \ shopt -s nullglob; \ if rm -rf $$directory; then \ echo "The entire directory $$directory was removed."; \ @@ -383,42 +383,42 @@ # Install the programs from this package into $prefix/bin: install-programs: META CONFIGME programs install-programs-local - @($(call READ_CONFIG, prefix); \ + @($(call READ_CONFIG, prefixInstall); \ $(call READ_META, name); \ - echo "Creating $$prefix/bin/..."; \ - (mkdir -p $$prefix/bin &> /dev/null || true); \ - echo "Creating $$prefix/sbin/..."; \ - (mkdir -p $$prefix/sbin &> /dev/null || true); \ - echo "Installing programs from $$name into $$prefix/bin/..."; \ + echo "Creating $$prefixInstall/bin/..."; \ + (mkdir -p $$prefixInstall/bin &> /dev/null || true); \ + echo "Creating $$prefixInstall/sbin/..."; \ + (mkdir -p $$prefixInstall/sbin &> /dev/null || true); \ + echo "Installing programs from $$name into $$prefixInstall/bin/..."; \ shopt -s nullglob; \ for file in $(OTHER_PROGRAMS_TO_INSTALL) _build/*.byte _build/*.native; do \ basename=`basename $$file`; \ if echo " $(ROOT_NATIVE_PROGRAMS) $(ROOT_BYTE_PROGRAMS) " | grep -q " $$basename "; then \ - echo "Installing "`basename $$file`" as a \"root program\" into $$prefix/sbin..."; \ - cp -a $$file $$prefix/sbin/; \ - chmod +x $$prefix/sbin/$$basename; \ + echo "Installing "`basename $$file`" as a \"root program\" into $$prefixInstall/sbin..."; \ + cp -a $$file $$prefixInstall/sbin/; \ + chmod +x $$prefixInstall/sbin/$$basename; \ else \ - echo "Installing "`basename $$file`" into $$prefix/bin..."; \ - cp -a $$file $$prefix/bin/; \ - chmod +x $$prefix/bin/$$basename; \ + echo "Installing "`basename $$file`" into $$prefixInstall/bin..."; \ + cp -a $$file $$prefixInstall/bin/; \ + chmod +x $$prefixInstall/bin/$$basename; \ fi; \ done) && \ echo 'Program installation was successful.' # Remove the programs from this package from $prefix/bin: uninstall-programs: META CONFIGME main uninstall-programs-local - @($(call READ_CONFIG, prefix); \ + @($(call READ_CONFIG, prefixInstall); \ $(call READ_META, name); \ echo "Removing $$name programs..."; \ shopt -s nullglob; \ for file in $(OTHER_PROGRAMS_TO_INSTALL) _build/*.byte _build/*.native; do \ basename=`basename $$file`; \ if echo " $(ROOT_NATIVE_PROGRAMS) $(ROOT_BYTE_PROGRAMS) " | grep -q " $$basename "; then \ - echo -e "Removing the \"root program\" $$basename from $$prefix/sbin..."; \ - export pathname=$$prefix/sbin/`basename $$file`; \ + echo -e "Removing the \"root program\" $$basename from $$prefixInstall/sbin..."; \ + export pathname=$$prefixInstall/sbin/`basename $$file`; \ else \ - echo -e "Removing $$basename from $$prefix/bin..."; \ - export pathname=$$prefix/bin/`basename $$file`; \ + echo -e "Removing $$basename from $$prefixInstall/bin..."; \ + export pathname=$$prefixInstall/bin/`basename $$file`; \ fi; \ rm -f $$pathname; \ done) && \ @@ -692,7 +692,7 @@ echo 'Evaluating $(1) failed.'; \ exit 1; \ fi; \ - for i in $(2) $(3) $(4) $(5) $(6) $(7) $(8) $(9); do \ + for i in $(2) $(3) $(4) $(5) $(6) $(7) $(8) $(9) $(10); do \ CMD="VAL=$$`echo $$i`"; eval $$CMD; \ if test -z "$$VAL"; then \ echo "FATAL: $${i} is undefined in $(1)."; \ @@ -708,7 +708,7 @@ # $(call GREP_AND_TEST,META,name); # $(call GREP_AND_TEST,META,name,version); GREP_AND_TEST = \ - for i in $(2) $(3) $(4) $(5) $(6) $(7) $(8) $(9); do \ + for i in $(2) $(3) $(4) $(5) $(6) $(7) $(8) $(9) $(10); do \ if ! CMD=`grep "^$$i=" $(1)`; then \ echo "FATAL: $$i is undefined in $(1)."; \ exit 1; \ @@ -723,7 +723,7 @@ # $(call READ_CONFIG,prefix,libraryprefix); # READ_CONFIG = \ - $(call SOURCE_AND_TEST,CONFIGME,$(1),$(2),$(3),$(4),$(5),$(6),$(7),$(8),$(9)) + $(call SOURCE_AND_TEST,CONFIGME,$(1),$(2),$(3),$(4),$(5),$(6),$(7),$(8),$(9), $(10)) # Instance of GREP_AND_TEST: read the file "META" searching for a names # for all given names. @@ -731,7 +731,7 @@ # $(call READ_META,name,version); # READ_META = \ - $(call GREP_AND_TEST,META,$(1),$(2),$(3),$(4),$(5),$(6),$(7),$(8),$(9)) + $(call GREP_AND_TEST,META,$(1),$(2),$(3),$(4),$(5),$(6),$(7),$(8),$(9), $(10)) # If the value of the 'version' variable contains the substring 'snapshot' then # append to its value the current date, in hacker format. 'version' must be already @@ -902,12 +902,13 @@ meta.ml: META CONFIGME @(echo "Building $@..." && \ $(call READ_META, name, version); \ - $(call READ_CONFIG, prefix, configurationprefix, documentationprefix localeprefix); \ + $(call READ_CONFIG, prefix, prefixInstall, configurationprefix, documentationprefix localeprefix); \ echo -e "(** Automatically generated meta-informations about the project and its building. *)" > $@ && \ echo -e "(* This file is automatically generated; please don't edit it. *)\n" >> $@ && \ echo -e "let name = \"$$name\";;" >> $@ && \ echo -e "let version = \"$$version\";;" >> $@ && \ echo -e "let prefix = \"$$prefix\";;" >> $@ && \ + echo -e "let prefixInstall = \"$$prefixInstall\";;" >> $@ && \ echo -e "let ocaml_version = \"$(OCAML_VERSION)\";;" >> $@ && \ echo -e "let ocaml_libraryprefix = \"$(OCAML_LIBRARYPREFIX)\";;" >> $@ && \ echo -e "let libraryprefix = \"$(LIBRARYPREFIX)\";;" >> $@ && \