diff --git a/Makefile b/Makefile index 7063ab59ac45..979ed7ba3926 100644 --- a/Makefile +++ b/Makefile @@ -353,7 +353,7 @@ install: VERSION \ "$(INSTALL_LIBDIR)" $(MAKE) -C runtime install - $(INSTALL_PROG) ocaml$(EXE) "$(INSTALL_BINDIR)/ocaml$(EXE)" + $(INSTALL_PROG) ocaml$(EXE) "$(INSTALL_BINDIR)" ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true" $(INSTALL_PROG) ocamlc$(EXE) "$(INSTALL_BINDIR)/ocamlc.byte$(EXE)" endif @@ -362,7 +362,7 @@ ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true" $(INSTALL_PROG) lex/ocamllex$(EXE) \ "$(INSTALL_BINDIR)/ocamllex.byte$(EXE)" endif - $(INSTALL_PROG) yacc/ocamlyacc$(EXE) "$(INSTALL_BINDIR)/ocamlyacc$(EXE)" + $(INSTALL_PROG) yacc/ocamlyacc$(EXE) "$(INSTALL_BINDIR)" $(INSTALL_DATA) \ utils/*.cmi \ parsing/*.cmi \ @@ -391,7 +391,7 @@ endif $(INSTALL_DATA) \ $(BYTESTART) $(TOPLEVELSTART) \ "$(INSTALL_COMPLIBDIR)" - $(INSTALL_PROG) $(expunge) "$(INSTALL_LIBDIR)/$(expunge)" + $(INSTALL_PROG) $(expunge) "$(INSTALL_LIBDIR)" $(INSTALL_DATA) \ toplevel/topdirs.cmi \ "$(INSTALL_LIBDIR)" @@ -420,7 +420,7 @@ ifeq "$(UNIX_OR_WIN32)" "win32" $(MAKE) install-flexdll; \ fi endif - $(INSTALL_DATA) Makefile.config "$(INSTALL_LIBDIR)/Makefile.config" + $(INSTALL_DATA) Makefile.config "$(INSTALL_LIBDIR)" ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true" if test -f ocamlopt$(EXE); then $(MAKE) installopt; else \ cd "$(INSTALL_BINDIR)"; \ @@ -511,11 +511,9 @@ endif .PHONY: installoptopt installoptopt: - $(INSTALL_PROG) ocamlc.opt$(EXE) "$(INSTALL_BINDIR)/ocamlc.opt$(EXE)" - $(INSTALL_PROG) ocamlopt.opt$(EXE) \ - "$(INSTALL_BINDIR)/ocamlopt.opt$(EXE)" - $(INSTALL_PROG) \ - lex/ocamllex.opt$(EXE) "$(INSTALL_BINDIR)/ocamllex.opt$(EXE)" + $(INSTALL_PROG) ocamlc.opt$(EXE) "$(INSTALL_BINDIR)" + $(INSTALL_PROG) ocamlopt.opt$(EXE) "$(INSTALL_BINDIR)" + $(INSTALL_PROG) lex/ocamllex.opt$(EXE) "$(INSTALL_BINDIR)" cd "$(INSTALL_BINDIR)"; \ $(LN) ocamlc.opt$(EXE) ocamlc$(EXE); \ $(LN) ocamlopt.opt$(EXE) ocamlopt$(EXE); \ @@ -538,8 +536,7 @@ installoptopt: $(OPTSTART:.cmo=.cmx) $(OPTSTART:.cmo=.$(O)) \ "$(INSTALL_COMPLIBDIR)" if test -f ocamlnat$(EXE) ; then \ - $(INSTALL_PROG) \ - ocamlnat$(EXE) "$(INSTALL_BINDIR)/ocamlnat$(EXE)"; \ + $(INSTALL_PROG) ocamlnat$(EXE) "$(INSTALL_BINDIR)"; \ $(INSTALL_DATA) \ toplevel/opttopdirs.cmi \ "$(INSTALL_LIBDIR)"; \ diff --git a/debugger/Makefile b/debugger/Makefile index 73d050e7ee30..1f94e74af6de 100644 --- a/debugger/Makefile +++ b/debugger/Makefile @@ -60,7 +60,7 @@ ocamldebug$(EXE): $(libraries) $(all_objects) $(CAMLC) $(LINKFLAGS) -o $@ -linkall $^ install: - $(INSTALL_PROG) ocamldebug$(EXE) "$(INSTALL_BINDIR)/ocamldebug$(EXE)" + $(INSTALL_PROG) ocamldebug$(EXE) "$(INSTALL_BINDIR)" clean:: rm -f ocamldebug ocamldebug.exe diff --git a/ocamldoc/Makefile b/ocamldoc/Makefile index 2f2704c56131..39b00d174449 100644 --- a/ocamldoc/Makefile +++ b/ocamldoc/Makefile @@ -294,7 +294,7 @@ install: $(MKDIR) "$(INSTALL_BINDIR)" $(MKDIR) "$(INSTALL_LIBDIR)/ocamldoc" $(MKDIR) "$(INSTALL_MANODIR)" - $(INSTALL_PROG) $(OCAMLDOC) "$(INSTALL_BINDIR)/$(OCAMLDOC)" + $(INSTALL_PROG) $(OCAMLDOC) "$(INSTALL_BINDIR)" $(INSTALL_DATA) \ ocamldoc.hva *.cmi $(OCAMLDOC_LIBCMA) \ "$(INSTALL_LIBDIR)/ocamldoc" @@ -321,8 +321,7 @@ installopt: installopt_really: $(MKDIR) "$(INSTALL_BINDIR)" $(MKDIR) "$(INSTALL_LIBDIR)/ocamldoc" - $(INSTALL_PROG) \ - $(OCAMLDOC_OPT) "$(INSTALL_BINDIR)/$(OCAMLDOC_OPT)" + $(INSTALL_PROG) $(OCAMLDOC_OPT) "$(INSTALL_BINDIR)" $(INSTALL_DATA) \ $(OCAMLDOC_LIBCMIS) \ "$(INSTALL_LIBDIR)/ocamldoc" diff --git a/otherlibs/Makefile.otherlibs.common b/otherlibs/Makefile.otherlibs.common index e18ee72c6ac5..1d43b1315d11 100644 --- a/otherlibs/Makefile.otherlibs.common +++ b/otherlibs/Makefile.otherlibs.common @@ -86,8 +86,7 @@ lib$(CLIBNAME).$(A): $(COBJS) install:: if test -f dll$(CLIBNAME)$(EXT_DLL); then \ $(INSTALL_PROG) \ - dll$(CLIBNAME)$(EXT_DLL) \ - "$(INSTALL_STUBLIBDIR)/"; \ + dll$(CLIBNAME)$(EXT_DLL) "$(INSTALL_STUBLIBDIR)"; \ fi ifneq "$(STUBSLIB)" "" $(INSTALL_DATA) $(STUBSLIB) "$(INSTALL_LIBDIR)/" @@ -113,7 +112,7 @@ installopt: "$(INSTALL_LIBDIR)/" cd "$(INSTALL_LIBDIR)"; $(RANLIB) $(LIBNAME).a if test -f $(LIBNAME).cmxs; then \ - $(INSTALL_PROG) $(LIBNAME).cmxs "$(INSTALL_LIBDIR)/"; \ + $(INSTALL_PROG) $(LIBNAME).cmxs "$(INSTALL_LIBDIR)"; \ fi partialclean: diff --git a/otherlibs/dynlink/Makefile b/otherlibs/dynlink/Makefile index b1e419840112..24b5611552af 100644 --- a/otherlibs/dynlink/Makefile +++ b/otherlibs/dynlink/Makefile @@ -241,8 +241,7 @@ ifeq "$(INSTALL_SOURCE_ARTIFACTS)" "true" dynlink.cmti dynlink.mli \ "$(INSTALL_LIBDIR)" endif - $(INSTALL_PROG) \ - $(extract_crc) "$(INSTALL_LIBDIR)/$(extract_crc)" + $(INSTALL_PROG) $(extract_crc) "$(INSTALL_LIBDIR)" installopt: if $(NATDYNLINK); then \ diff --git a/otherlibs/systhreads/Makefile b/otherlibs/systhreads/Makefile index b918fd0b33ec..7852bc89bbcd 100644 --- a/otherlibs/systhreads/Makefile +++ b/otherlibs/systhreads/Makefile @@ -109,8 +109,7 @@ INSTALL_THREADSLIBDIR=$(INSTALL_LIBDIR)/$(LIBNAME) install: if test -f dllthreads$(EXT_DLL); then \ - $(INSTALL_PROG) \ - dllthreads$(EXT_DLL) "$(INSTALL_STUBLIBDIR)/dllthreads$(EXT_DLL)"; \ + $(INSTALL_PROG) dllthreads$(EXT_DLL) "$(INSTALL_STUBLIBDIR)"; \ fi $(INSTALL_DATA) libthreads.$(A) "$(INSTALL_LIBDIR)" cd "$(INSTALL_LIBDIR)"; $(RANLIB) libthreads.$(A) diff --git a/tools/Makefile b/tools/Makefile index fa5fcb1e5358..01ee67855a41 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -188,19 +188,18 @@ ifeq "$(INSTALL_BYTECODE_PROGRAMS)" "true" do \ $(INSTALL_PROG) "$$i$(EXE)" "$(INSTALL_BINDIR)/$$i.byte$(EXE)"; \ if test -f "$$i".opt$(EXE); then \ - $(INSTALL_PROG) "$$i.opt$(EXE)" \ - "$(INSTALL_BINDIR)/$$i.opt$(EXE)" && \ - (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ + $(INSTALL_PROG) "$$i.opt$(EXE)" "$(INSTALL_BINDIR)" && \ + (cd "$(INSTALL_BINDIR)" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ else \ - (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.byte$(EXE)" "$$i$(EXE)"); \ + (cd "$(INSTALL_BINDIR)" && $(LN) "$$i.byte$(EXE)" "$$i$(EXE)"); \ fi; \ done else for i in $(install_files); \ do \ if test -f "$$i".opt$(EXE); then \ - $(INSTALL_PROG) "$$i.opt$(EXE)" "$(INSTALL_BINDIR)/$$i.opt$(EXE)"; \ - (cd "$(INSTALL_BINDIR)/" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ + $(INSTALL_PROG) "$$i.opt$(EXE)" "$(INSTALL_BINDIR)"; \ + (cd "$(INSTALL_BINDIR)" && $(LN) "$$i.opt$(EXE)" "$$i$(EXE)"); \ fi; \ done endif @@ -244,10 +243,9 @@ install:: $(INSTALL_PROG)\ ocamlcmt.opt$(EXE) "$(INSTALL_BINDIR)/ocamlcmt$(EXE)"; \ else \ - $(INSTALL_PROG) ocamlcmt$(EXE) "$(INSTALL_BINDIR)/ocamlcmt$(EXE)"; \ + $(INSTALL_PROG) ocamlcmt$(EXE) "$(INSTALL_BINDIR)"; \ fi - # The bytecode disassembler DUMPOBJ= \ @@ -301,8 +299,7 @@ OBJINFO=$(ROOTDIR)/compilerlibs/ocamlcommon.cma \ $(call byte_and_opt,ocamlobjinfo,$(OBJINFO),objinfo_helper$(EXE)) install:: - $(INSTALL_PROG) \ - objinfo_helper$(EXE) "$(INSTALL_LIBDIR)/objinfo_helper$(EXE)" + $(INSTALL_PROG) objinfo_helper$(EXE) "$(INSTALL_LIBDIR)" primreq=$(ROOTDIR)/compilerlibs/ocamlcommon.cma \ $(ROOTDIR)/compilerlibs/ocamlbytecomp.cma \