diff options
-rw-r--r-- | cpp/doc/Makefile.mak | 4 | ||||
-rwxr-xr-x | cpp/install/common/components/components.ini | 6 | ||||
-rwxr-xr-x | cpp/install/common/components/ice.service.readme | 1 | ||||
-rwxr-xr-x | cpp/install/common/components/sample.config.files | 1 |
4 files changed, 8 insertions, 4 deletions
diff --git a/cpp/doc/Makefile.mak b/cpp/doc/Makefile.mak index cf4e27b1434..d6f42fdeac9 100644 --- a/cpp/doc/Makefile.mak +++ b/cpp/doc/Makefile.mak @@ -34,6 +34,6 @@ reference\index.html: $(SLICEFILES) clean:: -rd /s /q reference -install:: reference\index.html - copy index.html $(install_docdir) +install:: reference\index.html + copy reference\index.html $(install_docdir) xcopy /i /s /y reference $(install_docdir)\reference diff --git a/cpp/install/common/components/components.ini b/cpp/install/common/components/components.ini index 569fbd59160..f6f6ee52ca6 100755 --- a/cpp/install/common/components/components.ini +++ b/cpp/install/common/components/components.ini @@ -125,7 +125,7 @@ source8=%(BUILD_DIR)s/release/Ice-%(version)s/src/ca filelist8=ice.ca.files dest8=bin -source9=%(INSTALL_TOOLS)s/windows +source9=%(BUILD_DIR)s/release/Ice-%(version)s/config filelist9=sample.config.files dest9=config processor9=fixVersion @@ -134,6 +134,10 @@ source10=%(BUILD_DIR)s/release/IceJ-%(version)s-java2/resources filelist10=icegrid.help dest10=doc +source11=%(BUILD_DIR)s/release/Ice-%(version)s +filelist11=ice.service.readme +dest11=. + [ice dev] elements=8 active=1 diff --git a/cpp/install/common/components/ice.service.readme b/cpp/install/common/components/ice.service.readme new file mode 100755 index 00000000000..50ab5217723 --- /dev/null +++ b/cpp/install/common/components/ice.service.readme @@ -0,0 +1 @@ +WINDOWS_SERVICES.txt
diff --git a/cpp/install/common/components/sample.config.files b/cpp/install/common/components/sample.config.files index d6d0cb077cb..e3b6ea1d216 100755 --- a/cpp/install/common/components/sample.config.files +++ b/cpp/install/common/components/sample.config.files @@ -1,4 +1,3 @@ icegridregistry.cfg
icegridnode.cfg
glacier2router.cfg
-WINDOWS_SERVICE.txt
|