summaryrefslogtreecommitdiff
path: root/cpp/src
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2014-08-21 23:54:46 +0200
committerJose <jose@zeroc.com>2014-08-21 23:54:46 +0200
commitdfa81fb06e4ad5c0d509f56cee94bf493d50c573 (patch)
treed179df7cdf8442cdf759e417efb21e3ef6395e1f /cpp/src
parentAdd icestormigrate back removed while removing IceDB (diff)
downloadice-dfa81fb06e4ad5c0d509f56cee94bf493d50c573.tar.bz2
ice-dfa81fb06e4ad5c0d509f56cee94bf493d50c573.tar.xz
ice-dfa81fb06e4ad5c0d509f56cee94bf493d50c573.zip
icestormmigrate install fixes
Diffstat (limited to 'cpp/src')
-rw-r--r--cpp/src/IceStorm/Makefile2
-rw-r--r--cpp/src/IceStorm/Makefile.mak3
2 files changed, 5 insertions, 0 deletions
diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile
index 31f24922bcf..912fb2ec5cb 100644
--- a/cpp/src/IceStorm/Makefile
+++ b/cpp/src/IceStorm/Makefile
@@ -154,5 +154,7 @@ install:: all
$(call installlib,$(DESTDIR)$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME))
$(call installprogram,$(ADMIN),$(DESTDIR)$(install_bindir))
$(call installdata,$(top_srcdir)/../man/man1/icestormadmin.1,$(DESTDIR)$(install_mandir))
+ $(call installprogram,$(MIGRATE),$(DESTDIR)$(install_bindir))
+ $(call installdata,$(top_srcdir)/../man/man1/icestormmigrate.1,$(DESTDIR)$(install_mandir))
include .depend
diff --git a/cpp/src/IceStorm/Makefile.mak b/cpp/src/IceStorm/Makefile.mak
index 94c45ce789f..44193b97296 100644
--- a/cpp/src/IceStorm/Makefile.mak
+++ b/cpp/src/IceStorm/Makefile.mak
@@ -160,17 +160,20 @@ clean::
-del /q V32Format.cpp V32Format.h
-del /q V31Format.cpp V31Format.h
-del /q $(ADMIN:.exe=.*)
+ -del /q $(MIGRATE:.exe=.*)
-del /q IceStormAdmin.res IceStormDB.res IceStormService.res
install:: all
copy $(LIBNAME) "$(install_libdir)"
copy $(DLLNAME) "$(install_bindir)"
copy $(ADMIN) "$(install_bindir)"
+ copy $(MIGRATE) "$(install_bindir)"
!if "$(GENERATE_PDB)" == "yes"
install:: all
copy $(ADMIN:.exe=.pdb) "$(install_bindir)"
+ copy $(MIGRATE:.exe=.pdb) "$(install_bindir)"
copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
!endif