Straighten out the INSTALL_* Makefile variables · anil.recoil.org/unpac-unpac@3d7cf77

+29 -35

Makefile

··· 52 52 53 53 LIBFILES=stdlib.cma std_exit.cmo *.cmi $(HEADER_NAME) 54 54 55 - COMPLIBDIR=$(LIBDIR)/compiler-libs 56 - 57 55 TOPINCLUDES=$(addprefix -I otherlibs/,$(filter-out %threads,$(OTHERLIBRARIES))) 58 56 59 57 expunge := expunge$(EXE) ··· 935 933 rm -f flexlink.opt flexlink.opt.exe \ 936 934 $(OPT_BINDIR)/flexlink $(OPT_BINDIR)/flexlink.exe 937 935 938 - INSTALL_COMPLIBDIR = $(DESTDIR)$(COMPLIBDIR) 939 - INSTALL_FLEXDLLDIR = $(INSTALL_LIBDIR)/flexdll 940 936 FLEXDLL_MANIFEST = default$(filter-out _i386,_$(ARCH)).manifest 941 937 942 938 DOC_FILES=\ ··· 2749 2745 $(BYTE_BUILD_TREE) $(OPT_BUILD_TREE) 2750 2746 rm -f config.log config.status libtool 2751 2747 2752 - INSTALL_LIBDIR_DYNLINK = $(INSTALL_LIBDIR)/dynlink 2753 - 2754 2748 # COMPILER_ARTEFACT_DIRS adds the common compiler-libs directories as prefixes 2755 2749 # to a sequence of patterns in the first argument, e.g. 2756 2750 # $(call COMPILER_ARTEFACT_DIRS, *.cmi) expands to utils/*.cmi, parsing/*.cmi, ··· 2775 2769 ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true" 2776 2770 $(MKDIR) "$(INSTALL_STUBLIBDIR)" 2777 2771 endif 2778 - $(MKDIR) "$(INSTALL_COMPLIBDIR)" 2772 + $(MKDIR) "$(INSTALL_LIBDIR_COMPILERLIBS)" 2779 2773 $(MKDIR) "$(INSTALL_DOCDIR)" 2780 - $(MKDIR) "$(INSTALL_INCDIR)" 2774 + $(MKDIR) "$(INSTALL_LIBDIR_CAML)" 2781 2775 $(MKDIR) "$(INSTALL_LIBDIR_PROFILING)" 2782 2776 2783 2777 ifeq "$(SUFFIXING)" "true" ··· 2829 2823 2830 2824 install:: 2831 2825 $(INSTALL_DATA) runtime/caml/domain_state.tbl runtime/caml/*.h \ 2832 - "$(INSTALL_INCDIR)" 2826 + "$(INSTALL_LIBDIR_CAML)" 2833 2827 $(INSTALL_PROG) ocaml$(EXE) "$(INSTALL_BINDIR)" 2834 2828 ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true" 2835 2829 $(call STRIP_BYTE_PROG, ocamlc$(EXE)) ··· 2870 2864 $(INSTALL_PROG) $(ocamlyacc_PROGRAM)$(EXE) "$(INSTALL_BINDIR)" 2871 2865 $(INSTALL_DATA) \ 2872 2866 $(call COMPILER_ARTEFACT_DIRS, *.cmi) \ 2873 - "$(INSTALL_COMPLIBDIR)" 2867 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 2874 2868 ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true" 2875 2869 $(INSTALL_DATA) \ 2876 2870 $(call COMPILER_ARTEFACT_DIRS, *.cmt *.cmti *.mli) \ 2877 - "$(INSTALL_COMPLIBDIR)" 2871 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 2878 2872 $(INSTALL_DATA) \ 2879 2873 toplevel/byte/*.cmt \ 2880 - "$(INSTALL_COMPLIBDIR)" 2874 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 2881 2875 $(INSTALL_DATA) \ 2882 2876 tools/profiling.cmt tools/profiling.cmti \ 2883 2877 "$(INSTALL_LIBDIR_PROFILING)" 2884 2878 endif 2885 2879 $(INSTALL_DATA) \ 2886 2880 compilerlibs/*.cma compilerlibs/META \ 2887 - "$(INSTALL_COMPLIBDIR)" 2881 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 2888 2882 $(INSTALL_DATA) \ 2889 2883 $(ocamlc_CMO_FILES) $(ocaml_CMO_FILES) \ 2890 - "$(INSTALL_COMPLIBDIR)" 2884 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 2891 2885 $(INSTALL_PROG) $(expunge) "$(INSTALL_LIBDIR)" 2892 2886 # If installing over a previous OCaml version, ensure some modules are removed 2893 2887 # from the previous installation. ··· 2918 2912 $(MAKE) -C otherlibs/$$i install || exit $$?; \ 2919 2913 done 2920 2914 ifeq "$(build_ocamldoc)" "true" 2921 - $(MKDIR) "$(INSTALL_LIBDIR)/ocamldoc" 2915 + $(MKDIR) "$(INSTALL_LIBDIR_OCAMLDOC)" 2922 2916 $(INSTALL_PROG) ocamldoc/ocamldoc$(EXE) "$(INSTALL_BINDIR)" 2923 2917 $(INSTALL_DATA) \ 2924 2918 ocamldoc/ocamldoc.hva ocamldoc/*.cmi ocamldoc/odoc_info.cma \ 2925 2919 ocamldoc/META \ 2926 - "$(INSTALL_LIBDIR)/ocamldoc" 2920 + "$(INSTALL_LIBDIR_OCAMLDOC)" 2927 2921 ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true" 2928 2922 $(INSTALL_DATA) \ 2929 2923 $(OCAMLDOC_LIBMLIS) $(OCAMLDOC_LIBCMTS) \ 2930 - "$(INSTALL_LIBDIR)/ocamldoc" 2924 + "$(INSTALL_LIBDIR_OCAMLDOC)" 2931 2925 endif 2932 2926 endif 2933 2927 ifeq "$(build_libraries_manpages)" "true" ··· 2945 2939 $(INSTALL_PROG) \ 2946 2940 flexlink.byte$(EXE) "$(INSTALL_BINDIR)" 2947 2941 endif # ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true" 2948 - $(MKDIR) "$(INSTALL_FLEXDLLDIR)" 2949 - $(INSTALL_DATA) $(FLEXDLL_OBJECTS) "$(INSTALL_FLEXDLLDIR)" 2942 + $(MKDIR) "$(INSTALL_LIBDIR_FLEXDLL)" 2943 + $(INSTALL_DATA) $(FLEXDLL_OBJECTS) "$(INSTALL_LIBDIR_FLEXDLL)" 2950 2944 endif # ifeq "$(BOOTSTRAPPING_FLEXDLL)" "true" 2951 2945 $(INSTALL_DATA) Makefile.config "$(INSTALL_LIBDIR)" 2952 2946 $(INSTALL_DATA) $(DOC_FILES) "$(INSTALL_DOCDIR)" ··· 2981 2975 $(MAKE) -C stdlib installopt 2982 2976 $(INSTALL_DATA) \ 2983 2977 middle_end/*.cmi \ 2984 - "$(INSTALL_COMPLIBDIR)" 2978 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 2985 2979 $(INSTALL_DATA) \ 2986 2980 middle_end/closure/*.cmi \ 2987 - "$(INSTALL_COMPLIBDIR)" 2981 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 2988 2982 $(INSTALL_DATA) \ 2989 2983 middle_end/flambda/*.cmi \ 2990 - "$(INSTALL_COMPLIBDIR)" 2984 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 2991 2985 $(INSTALL_DATA) \ 2992 2986 middle_end/flambda/base_types/*.cmi \ 2993 - "$(INSTALL_COMPLIBDIR)" 2987 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 2994 2988 $(INSTALL_DATA) \ 2995 2989 asmcomp/*.cmi \ 2996 - "$(INSTALL_COMPLIBDIR)" 2990 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 2997 2991 ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true" 2998 2992 $(INSTALL_DATA) \ 2999 2993 $(addprefix middle_end/, *.cmt *.cmti *.mli) \ 3000 - "$(INSTALL_COMPLIBDIR)" 2994 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 3001 2995 $(INSTALL_DATA) \ 3002 2996 $(addprefix middle_end/closure/, *.cmt *.cmti *.mli) \ 3003 - "$(INSTALL_COMPLIBDIR)" 2997 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 3004 2998 $(INSTALL_DATA) \ 3005 2999 $(addprefix middle_end/flambda/, *.cmt *.cmti *.mli) \ 3006 - "$(INSTALL_COMPLIBDIR)" 3000 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 3007 3001 $(INSTALL_DATA) \ 3008 3002 $(addprefix middle_end/flambda/base_types/, *.cmt *.cmti *.mli) \ 3009 - "$(INSTALL_COMPLIBDIR)" 3003 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 3010 3004 $(INSTALL_DATA) \ 3011 3005 $(addprefix asmcomp/, *.cmt *.cmti *.mli) \ 3012 - "$(INSTALL_COMPLIBDIR)" 3006 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 3013 3007 endif 3014 3008 $(INSTALL_DATA) \ 3015 3009 $(ocamlopt_CMO_FILES) \ 3016 - "$(INSTALL_COMPLIBDIR)" 3010 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 3017 3011 ifeq "$(build_ocamldoc)" "true" 3018 3012 $(if $(wildcard ocamldoc/ocamldoc.opt$(EXE)), \ 3019 3013 $(INSTALL_PROG) ocamldoc/ocamldoc.opt$(EXE) "$(INSTALL_BINDIR)") ··· 3021 3015 $(INSTALL_DATA) \ 3022 3016 ocamldoc/*.cmx ocamldoc/odoc_info.$(A) \ 3023 3017 ocamldoc/odoc_info.cmxa \ 3024 - "$(INSTALL_LIBDIR)/ocamldoc") 3018 + "$(INSTALL_LIBDIR_OCAMLDOC)") 3025 3019 endif 3026 3020 ifeq "$(strip $(NATDYNLINK))" "true" 3027 3021 $(INSTALL_DATA) \ ··· 3067 3061 $(INSTALL_DATA) \ 3068 3062 $(call COMPILER_ARTEFACT_DIRS, *.cmx, $(NATIVE_ARTEFACT_DIRS)) \ 3069 3063 toplevel/native/tophooks.cmi \ 3070 - "$(INSTALL_COMPLIBDIR)" 3064 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 3071 3065 $(INSTALL_DATA) \ 3072 3066 compilerlibs/*.cmxa compilerlibs/*.$(A) \ 3073 - "$(INSTALL_COMPLIBDIR)" 3067 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 3074 3068 $(INSTALL_DATA) \ 3075 3069 $(ocamlc_CMX_FILES:.cmx=.$(O)) \ 3076 3070 $(ocamlopt_CMX_FILES:.cmx=.$(O)) \ 3077 3071 $(ocamlnat_CMX_FILES:.cmx=.$(O)) \ 3078 - "$(INSTALL_COMPLIBDIR)" 3072 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 3079 3073 ifeq "$(INSTALL_OCAMLNAT)" "true" 3080 3074 $(INSTALL_PROG) ocamlnat$(EXE) "$(INSTALL_BINDIR)" 3081 3075 endif ··· 3087 3081 $(INSTALL_DATA) \ 3088 3082 $(call COMPILER_ARTEFACT_DIRS, *.ml, $(NATIVE_ARTEFACT_DIRS)) \ 3089 3083 toplevel/byte/*.ml \ 3090 - "$(INSTALL_COMPLIBDIR)" 3084 + "$(INSTALL_LIBDIR_COMPILERLIBS)" 3091 3085 endif 3092 3086 3093 3087 include .depend

+23 -8

Makefile.common

··· 86 86 endif 87 87 88 88 DESTDIR ?= 89 - INSTALL_BINDIR := $(DESTDIR)$(BINDIR) 90 - INSTALL_LIBDIR := $(DESTDIR)$(LIBDIR) 91 - INSTALL_INCDIR=$(INSTALL_LIBDIR)/caml 92 - INSTALL_STUBLIBDIR := $(DESTDIR)$(STUBLIBDIR) 89 + 90 + # Augment directories from Makefile.config / Makefile.build_config with 91 + # $(DESTDIR). i.e. each of these 5 directories may be overridden by the user, 92 + # and the compiler distribution makes no assumptions about where they are 93 + # relative to each other. 94 + INSTALL_BINDIR = $(DESTDIR)$(BINDIR) 95 + INSTALL_DOCDIR = $(DESTDIR)$(DOCDIR) 96 + INSTALL_LIBDIR = $(DESTDIR)$(LIBDIR) 97 + INSTALL_MANDIR = $(DESTDIR)$(MANDIR) 98 + INSTALL_STUBLIBDIR = $(DESTDIR)$(STUBLIBDIR) 99 + 100 + # Library subdirectories. The compiler distribution does make assumptions about 101 + # these, and they cannot be freely overridden by the user. 102 + INSTALL_LIBDIR_CAML = $(INSTALL_LIBDIR)/caml 103 + INSTALL_LIBDIR_COMPILERLIBS = $(INSTALL_LIBDIR)/compiler-libs 104 + INSTALL_LIBDIR_DYNLINK = $(INSTALL_LIBDIR)/dynlink 105 + INSTALL_LIBDIR_FLEXDLL = $(INSTALL_LIBDIR)/flexdll 106 + INSTALL_LIBDIR_OCAMLDOC = $(INSTALL_LIBDIR)/ocamldoc 93 107 INSTALL_LIBDIR_PROFILING = $(INSTALL_LIBDIR)/profiling 94 - INSTALL_MANDIR := $(DESTDIR)$(MANDIR) 95 - INSTALL_PROGRAMS_MAN_DIR := $(DESTDIR)$(PROGRAMS_MAN_DIR) 96 - INSTALL_LIBRARIES_MAN_DIR := $(DESTDIR)$(LIBRARIES_MAN_DIR) 97 - INSTALL_DOCDIR := $(DESTDIR)$(DOCDIR) 108 + INSTALL_LIBDIR_STDLIB = $(INSTALL_LIBDIR)/stdlib 109 + INSTALL_LIBDIR_SYSTHREADS = $(INSTALL_LIBDIR)/threads 110 + 111 + INSTALL_MANDIR_PROGRAMS = $(INSTALL_MANDIR)/man1 112 + INSTALL_MANDIR_LIBRARIES = $(INSTALL_MANDIR)/man3 98 113 99 114 FLEXDLL_SUBMODULE_PRESENT := $(wildcard $(ROOTDIR)/flexdll/Makefile) 100 115

+2 -2

api_docgen/ocamldoc/Makefile

··· 121 121 122 122 .PHONY: install 123 123 install: 124 - $(MKDIR) "$(INSTALL_LIBRARIES_MAN_DIR)" 124 + $(MKDIR) "$(INSTALL_MANDIR_LIBRARIES)" 125 125 $(if $(wildcard build/man), \ 126 - $(INSTALL_DATA) build/man/*.3o "$(INSTALL_LIBRARIES_MAN_DIR)") 126 + $(INSTALL_DATA) build/man/*.3o "$(INSTALL_MANDIR_LIBRARIES)")

+3 -3

api_docgen/odoc/Makefile

··· 191 191 # Man pages are the only installed documentation 192 192 .PHONY: install 193 193 install: 194 - $(MKDIR) "$(INSTALL_LIBRARIES_MAN_DIR)" 194 + $(MKDIR) "$(INSTALL_MANDIR_LIBRARIES)" 195 195 $(if $(wildcard build/man/libref), \ 196 - $(INSTALL_DATA) build/man/libref/* "$(INSTALL_LIBRARIES_MAN_DIR)") 196 + $(INSTALL_DATA) build/man/libref/* "$(INSTALL_MANDIR_LIBRARIES)") 197 197 $(if $(wildcard build/man/compilerlibref), \ 198 - $(INSTALL_DATA) build/man/libref/* "$(INSTALL_LIBRARIES_MAN_DIR)") 198 + $(INSTALL_DATA) build/man/libref/* "$(INSTALL_MANDIR_LIBRARIES)") 199 199 200 200 # Dependencies for stdlib modules. 201 201 # Use the same dependencies used for compiling .cmx files.

+2 -2

man/Makefile

··· 22 22 23 23 .PHONY: install 24 24 install: 25 - $(MKDIR) $(call QUOTE_SINGLE,$(INSTALL_PROGRAMS_MAN_DIR)) 26 - $(INSTALL_DATA) $(MANPAGES) $(call QUOTE_SINGLE,$(INSTALL_PROGRAMS_MAN_DIR)) 25 + $(MKDIR) $(call QUOTE_SINGLE,$(INSTALL_MANDIR_PROGRAMS)) 26 + $(INSTALL_DATA) $(MANPAGES) $(call QUOTE_SINGLE,$(INSTALL_MANDIR_PROGRAMS))

+1 -1

otherlibs/Makefile.otherlibs.common

··· 135 135 "$(INSTALL_LIBDIR_LIBNAME)/" 136 136 endif 137 137 ifneq "$(HEADERS)" "" 138 - $(INSTALL_DATA) $(HEADERS) "$(INSTALL_INCDIR)/" 138 + $(INSTALL_DATA) $(HEADERS) "$(INSTALL_LIBDIR_CAML)/" 139 139 endif 140 140 141 141 installopt:

+6 -8

otherlibs/systhreads/Makefile

··· 103 103 distclean: clean 104 104 rm -f META 105 105 106 - INSTALL_THREADSLIBDIR=$(INSTALL_LIBDIR)/$(LIBNAME) 107 - 108 106 install: 109 107 ifeq "$(SUPPORTS_SHARED_LIBRARIES)" "true" 110 108 $(INSTALL_PROG) $(DLLTHREADS) "$(INSTALL_STUBLIBDIR)" 111 109 endif 112 110 $(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)" 113 - $(MKDIR) "$(INSTALL_THREADSLIBDIR)" 111 + $(MKDIR) "$(INSTALL_LIBDIR_SYSTHREADS)" 114 112 $(INSTALL_DATA) \ 115 113 $(CMIFILES) threads.cma META \ 116 - "$(INSTALL_THREADSLIBDIR)" 114 + "$(INSTALL_LIBDIR_SYSTHREADS)" 117 115 ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true" 118 116 $(INSTALL_DATA) \ 119 117 $(CMIFILES:.cmi=.cmti) \ 120 - "$(INSTALL_THREADSLIBDIR)" 121 - $(INSTALL_DATA) $(MLIFILES) "$(INSTALL_THREADSLIBDIR)" 118 + "$(INSTALL_LIBDIR_SYSTHREADS)" 119 + $(INSTALL_DATA) $(MLIFILES) "$(INSTALL_LIBDIR_SYSTHREADS)" 122 120 endif 123 - $(INSTALL_DATA) caml/threads.h "$(INSTALL_INCDIR)" 121 + $(INSTALL_DATA) caml/threads.h "$(INSTALL_LIBDIR_CAML)" 124 122 125 123 installopt: 126 124 $(INSTALL_DATA) libthreadsnat.$(A) "$(INSTALL_LIBDIR)" 127 125 $(INSTALL_DATA) \ 128 126 $(THREADS_NCOBJS) threads.cmxa threads.$(A) \ 129 - "$(INSTALL_THREADSLIBDIR)" 127 + "$(INSTALL_LIBDIR_SYSTHREADS)" 130 128 131 129 %.cmi: %.mli 132 130 $(V_OCAMLC)$(CAMLC) -c $(COMPFLAGS) $<

+5 -4

stdlib/Makefile

··· 47 47 OPTCOMPILER=$(ROOTDIR)/ocamlopt$(EXE) 48 48 CAMLOPT=$(OCAMLRUN) $(OPTCOMPILER) 49 49 50 + # At present, only META is installed to the package directory 51 + LIBNAME = stdlib 52 + 50 53 include StdlibModules 51 54 52 55 OBJS=$(addsuffix .cmo,$(STDLIB_MODULES)) ··· 60 63 allopt: stdlib.cmxa std_exit.cmx 61 64 opt.opt: allopt 62 65 63 - INSTALL_STDLIB_META_DIR=$(DESTDIR)$(LIBDIR)/stdlib 64 - 65 66 .PHONY: install 66 67 install:: 67 68 $(INSTALL_DATA) \ 68 69 stdlib.cma std_exit.cmo *.cmi "$(INSTALL_LIBDIR)" 69 - $(MKDIR) "$(INSTALL_STDLIB_META_DIR)" 70 - $(INSTALL_DATA) META "$(INSTALL_STDLIB_META_DIR)" 70 + $(MKDIR) "$(INSTALL_LIBDIR_STDLIB)" 71 + $(INSTALL_DATA) META "$(INSTALL_LIBDIR_STDLIB)" 71 72 ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true" 72 73 $(INSTALL_DATA) \ 73 74 *.cmt *.cmti *.mli *.ml *.ml.in \

Configure Feed

Configure Feed