diff options
| author | Lukas Larsson <[email protected]> | 2016-08-12 11:27:33 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2016-08-12 11:27:33 +0200 |
| commit | 9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2 (patch) | |
| tree | 52d5945fc0b4adde8fc73ba3f0e410f3c02b7828 /lib/jinterface/doc/src/Makefile | |
| parent | cd54106596b3471b42b59693a40e21b58729cdb0 (diff) | |
| parent | daa0f831aee9dedf8cdf29fd5f97f98f55e072e3 (diff) | |
| download | otp-9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2.tar.gz otp-9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2.tar.bz2 otp-9cd8c5319a9ffd71fc5f8db755b4014f199fc0f2.zip | |
Merge branch 'maint'
Conflicts:
lib/gs/doc/src/Makefile
Diffstat (limited to 'lib/jinterface/doc/src/Makefile')
| -rw-r--r-- | lib/jinterface/doc/src/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/jinterface/doc/src/Makefile b/lib/jinterface/doc/src/Makefile index cd1e61a795..508c8e01b5 100644 --- a/lib/jinterface/doc/src/Makefile +++ b/lib/jinterface/doc/src/Makefile @@ -166,7 +166,7 @@ release_docs_spec: docs $(INSTALL_DIR) "$(RELSYSDIR)/doc/html" $(INSTALL_DIR) "$(RELSYSDIR)/doc/html/java/$(JAVA_PKG_PATH)" $(INSTALL_DATA) $(INFO_FILE) "$(RELSYSDIR)" - (/bin/cp -rf ../html "$(RELSYSDIR)/doc") + ($(CP) -rf ../html "$(RELSYSDIR)/doc") # $(INSTALL_DATA) $(GIF_FILES) $(EXTRA_FILES) $(HTML_FILES) \ # "$(RELSYSDIR)/doc/html" |