diff options
Diffstat (limited to 'cpp')
39 files changed, 96 insertions, 86 deletions
diff --git a/cpp/Makefile b/cpp/Makefile index 5df632b1ea8..97384bcd092 100644 --- a/cpp/Makefile +++ b/cpp/Makefile @@ -17,43 +17,37 @@ install:: @if test ! -d $(prefix) ; \ then \ echo "Creating $(prefix)..." ; \ - mkdir $(prefix) ; \ - chmod a+rx $(prefix) ; \ + $(call mkdir,$(prefix)) ; \ fi @if test ! -d $(install_bindir) ; \ then \ echo "Creating $(install_bindir)..." ; \ - mkdir -p $(install_bindir) ; \ - chmod a+rx $(install_bindir) ; \ + $(call mkdir,$(install_bindir)) ; \ fi @if test ! -d $(install_libdir) ; \ then \ echo "Creating $(install_libdir)..." ; \ - mkdir -p $(install_libdir) ; \ - chmod a+rx $(install_libdir) ; \ + $(call mkdir,$(install_libdir)) ; \ fi @if test ! -d $(install_includedir) ; \ then \ echo "Creating $(install_includedir)..." ; \ - mkdir $(install_includedir) ; \ - chmod a+rx $(install_includedir) ; \ + $(call mkdir,$(install_includedir)) ; \ fi @if test ! -d $(install_slicedir) ; \ then \ echo "Creating $(install_slicedir)..." ; \ - mkdir $(install_slicedir) ; \ - chmod a+rx $(install_slicedir) ; \ + $(call mkdir,$(install_slicedir)) ; \ fi @if test ! -d $(install_docdir) ; \ then \ echo "Creating $(install_docdir)..." ; \ - mkdir $(install_docdir) ; \ - chmod a+rx $(install_docdir) ; \ + $(call mkdir,$(install_docdir)) ; \ fi $(EVERYTHING):: @@ -68,8 +62,8 @@ doc:: install:: @( cd doc && $(MAKE) install ) || exit 1 - $(INSTALL) ICE_LICENSE $(prefix) - $(INSTALL) LICENSE $(prefix) + $(call installdata,ICE_LICENSE,$(prefix)) + $(call installdata,LICENSE,$(prefix)) clean:: @( cd doc && $(MAKE) clean ) || exit 1 diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules index 3f37de2fee7..b04d1a332cb 100644 --- a/cpp/config/Make.rules +++ b/cpp/config/Make.rules @@ -286,7 +286,23 @@ endif ifeq ($(installlib),) installlib = $(INSTALL) $(2)/$(3) $(1); \ rm -f $(1)/$(4); ln -s $(3) $(1)/$(4); \ - rm -f $(1)/$(5); ln -s $(4) $(1)/$(5) + rm -f $(1)/$(5); ln -s $(4) $(1)/$(5); \ + chmod a+rx $(1)/$(3) +endif + +ifeq ($(installdata),) + installdata = $(INSTALL_DATA) $(1) $(2); \ + chmod a+r $(2)/$(notdir $(1)) +endif + +ifeq ($(installprogram),) + installprogram = $(INSTALL_PROGRAM) $(1) $(2); \ + chmod a+rx $(2)/$(notdir $(1)) +endif + +ifeq ($(mkdir),) + mkdir = mkdir $(1) ; \ + chmod a+rx $(1) endif SLICEPARSERLIB = $(libdir)/$(call mklibfilename,Slice,$(VERSION)) diff --git a/cpp/doc/Makefile b/cpp/doc/Makefile index e4b322e9b05..f1e348e06db 100644 --- a/cpp/doc/Makefile +++ b/cpp/doc/Makefile @@ -62,28 +62,26 @@ install:: if test ! -d $(install_docdir)/reference ; \ then \ echo "Creating $(install_docdir)/reference..." ; \ - mkdir $(install_docdir)/reference ; \ - chmod a+rx $(install_docdir)/reference ; \ + $(call mkdir,$(install_docdir)/reference) ; \ fi ; \ echo "Installing HTML..." ; \ - ${INSTALL_DATA} README.html $(install_docdir)/README.html ; \ - ${INSTALL_DATA} reference/*.html $(install_docdir)/reference ; \ + $(call installdata,README.html,$(install_docdir)) ; \ + $(call installdata,reference/*.html,$(install_docdir)/reference) ; \ if test ! -d $(install_docdir)/reference/stylesheet-images ; \ then \ echo "Creating $(install_docdir)/reference/stylesheet-images..." ; \ - mkdir $(install_docdir)/reference/stylesheet-images ; \ - chmod a+rx $(install_docdir)/reference/stylesheet-images ; \ + $(call mkdir,$(install_docdir)/reference/stylesheet-images) ; \ fi ; \ echo "Installing images..." ; \ - ${INSTALL_DATA} images/*.gif $(install_docdir)/reference/stylesheet-images ; \ + $(call installdata,images/*.gif,$(install_docdir)/reference/stylesheet-images) ; \ fi @if test -f reference.pdf ; \ then \ echo "Installing reference.pdf..." ; \ - ${INSTALL_DATA} reference.pdf $(install_docdir) ; \ + $(call installdata,reference.pdf,$(install_docdir)) ; \ fi @if test -f reference.dvi ; \ then \ echo "Installing reference.dvi..." ; \ - ${INSTALL_DATA} reference.dvi $(install_docdir) ; \ + $(call installdata,reference.dvi,$(install_docdir)) ; \ fi diff --git a/cpp/include/Freeze/Makefile b/cpp/include/Freeze/Makefile index cef07597a86..4eccab462f3 100644 --- a/cpp/include/Freeze/Makefile +++ b/cpp/include/Freeze/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/Freeze ; \ then \ echo "Creating $(install_includedir)/Freeze..." ; \ - mkdir $(install_includedir)/Freeze ; \ - chmod a+rx $(install_includedir)/Freeze ; \ + $(call mkdir,$(install_includedir)/Freeze) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/Freeze/$$i ; \ + chmod a+r $(install_includedir)/Freeze/$$i ; \ done diff --git a/cpp/include/Glacier2/Makefile b/cpp/include/Glacier2/Makefile index 02101afc3df..3839c63b094 100644 --- a/cpp/include/Glacier2/Makefile +++ b/cpp/include/Glacier2/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/Glacier2 ; \ then \ echo "Creating $(install_includedir)/Glacier2..." ; \ - mkdir $(install_includedir)/Glacier2 ; \ - chmod a+rx $(install_includedir)/Glacier2 ; \ + $(call mkdir,$(install_includedir)/Glacier2) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/Glacier2/$$i ; \ + chmod a+r $(install_includedir)/Glacier2/$$i ; \ done diff --git a/cpp/include/Ice/Makefile b/cpp/include/Ice/Makefile index d2d32e2052f..79a45233a93 100644 --- a/cpp/include/Ice/Makefile +++ b/cpp/include/Ice/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/Ice ; \ then \ echo "Creating $(install_includedir)/Ice..." ; \ - mkdir $(install_includedir)/Ice ; \ - chmod a+rx $(install_includedir)/Ice ; \ + $(call mkdir,$(install_includedir)/Ice) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/Ice/$$i ; \ + chmod a+r $(install_includedir)/Ice/$$i ; \ done diff --git a/cpp/include/IceBox/Makefile b/cpp/include/IceBox/Makefile index 2a765e48b5a..d23f886019a 100644 --- a/cpp/include/IceBox/Makefile +++ b/cpp/include/IceBox/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/IceBox ; \ then \ echo "Creating $(install_includedir)/IceBox..." ; \ - mkdir $(install_includedir)/IceBox ; \ - chmod a+rx $(install_includedir)/IceBox ; \ + $(call mkdir,$(install_includedir)/IceBox) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/IceBox/$$i ; \ + chmod a+r $(install_includedir)/IceBox/$$i ; \ done diff --git a/cpp/include/IcePack/Makefile b/cpp/include/IcePack/Makefile index 72010e982c8..680da4cd033 100644 --- a/cpp/include/IcePack/Makefile +++ b/cpp/include/IcePack/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/IcePack ; \ then \ echo "Creating $(install_includedir)/IcePack..." ; \ - mkdir $(install_includedir)/IcePack ; \ - chmod a+rx $(install_includedir)/IcePack ; \ + $(call mkdir,$(install_includedir)/IcePack) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/IcePack/$$i ; \ + chmod a+r $(install_includedir)/IcePack/$$i ; \ done diff --git a/cpp/include/IcePatch2/Makefile b/cpp/include/IcePatch2/Makefile index 8b1ed15414f..d0033df0b35 100644 --- a/cpp/include/IcePatch2/Makefile +++ b/cpp/include/IcePatch2/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/IcePatch2 ; \ then \ echo "Creating $(install_includedir)/IcePatch2..." ; \ - mkdir $(install_includedir)/IcePatch2 ; \ - chmod a+rx $(install_includedir)/IcePatch2 ; \ + $(call mkdir,$(install_includedir)/IcePatch2) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/IcePatch2/$$i ; \ + chmod a+r $(install_includedir)/IcePatch2/$$i ; \ done diff --git a/cpp/include/IceSSL/Makefile b/cpp/include/IceSSL/Makefile index b18a08ff27d..c89926e9563 100644 --- a/cpp/include/IceSSL/Makefile +++ b/cpp/include/IceSSL/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/IceSSL ; \ then \ echo "Creating $(install_includedir)/IceSSL..." ; \ - mkdir $(install_includedir)/IceSSL ; \ - chmod a+rx $(install_includedir)/IceSSL ; \ + $(call mkdir,$(install_includedir)/IceSSL) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/IceSSL/$$i ; \ + chmod a+r $(install_includedir)/IceSSL/$$i ; \ done diff --git a/cpp/include/IceStorm/Makefile b/cpp/include/IceStorm/Makefile index efafd9f0f0e..61fefe96bc6 100644 --- a/cpp/include/IceStorm/Makefile +++ b/cpp/include/IceStorm/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/IceStorm ; \ then \ echo "Creating $(install_includedir)/IceStorm..." ; \ - mkdir $(install_includedir)/IceStorm ; \ - chmod a+rx $(install_includedir)/IceStorm ; \ + $(call mkdir,$(install_includedir)/IceStorm) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/IceStorm/$$i ; \ + chmod a+r $(install_includedir)/IceStorm/$$i ; \ done diff --git a/cpp/include/IceUtil/Makefile b/cpp/include/IceUtil/Makefile index 637316e9bd8..3f8fb2e713b 100644 --- a/cpp/include/IceUtil/Makefile +++ b/cpp/include/IceUtil/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/IceUtil ; \ then \ echo "Creating $(install_includedir)/IceUtil..." ; \ - mkdir $(install_includedir)/IceUtil ; \ - chmod a+rx $(install_includedir)/IceUtil ; \ + $(call mkdir,$(install_includedir)/IceUtil) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/IceUtil/$$i ; \ + chmod a+r $(install_includedir)/IceUtil/$$i ; \ done diff --git a/cpp/include/IceXML/Makefile b/cpp/include/IceXML/Makefile index 9a0c7427381..7f66c3a72b3 100644 --- a/cpp/include/IceXML/Makefile +++ b/cpp/include/IceXML/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/IceXML ; \ then \ echo "Creating $(install_includedir)/IceXML..." ; \ - mkdir $(install_includedir)/IceXML ; \ - chmod a+rx $(install_includedir)/IceXML ; \ + $(call mkdir,$(install_includedir)/IceXML) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/IceXML/$$i ; \ + chmod a+r $(install_includedir)/IceXML/$$i ; \ done diff --git a/cpp/include/Slice/Makefile b/cpp/include/Slice/Makefile index 5131de48c75..783ea953f40 100644 --- a/cpp/include/Slice/Makefile +++ b/cpp/include/Slice/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_includedir)/Slice ; \ then \ echo "Creating $(install_includedir)/Slice..." ; \ - mkdir $(install_includedir)/Slice ; \ - chmod a+rx $(install_includedir)/Slice ; \ + $(call mkdir,$(install_includedir)/Slice) ; \ fi @for i in *.h ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_includedir)/Slice/$$i ; \ + chmod a+r $(install_includedir)/Slice/$$i done diff --git a/cpp/makedist.py b/cpp/makedist.py index d449de3b8c4..bec21b79e86 100755 --- a/cpp/makedist.py +++ b/cpp/makedist.py @@ -371,6 +371,8 @@ if verbose: quiet = "v" else: quiet = "" +os.system("chmod -R u+rw,go+r . " + icever) +os.system("find " + icever + " -type d -exec chmod a+x {} \\;") os.system("tar c" + quiet + "f " + icever + ".tar " + icever) os.system("gzip -9 " + icever + ".tar") if verbose: diff --git a/cpp/slice/Freeze/Makefile b/cpp/slice/Freeze/Makefile index ca30ccf1a5c..cb80215473c 100644 --- a/cpp/slice/Freeze/Makefile +++ b/cpp/slice/Freeze/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_slicedir)/Freeze ; \ then \ echo "Creating $(install_slicedir)/Freeze..." ; \ - mkdir $(install_slicedir)/Freeze ; \ - chmod a+rx $(install_slicedir)/Freeze ; \ + $(call mkdir,$(install_slicedir)/Freeze) ; \ fi @for i in *.ice ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_slicedir)/Freeze/$$i ; \ + chmod a+r $(install_slicedir)/Freeze/$$i ; \ done diff --git a/cpp/slice/Glacier2/Makefile b/cpp/slice/Glacier2/Makefile index f79f384dbe8..3e5e2d30623 100644 --- a/cpp/slice/Glacier2/Makefile +++ b/cpp/slice/Glacier2/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_slicedir)/Glacier2 ; \ then \ echo "Creating $(install_slicedir)/Glacier2..." ; \ - mkdir $(install_slicedir)/Glacier2 ; \ - chmod a+rx $(install_slicedir)/Glacier2 ; \ + $(call mkdir,$(install_slicedir)/Glacier2) ; \ fi @for i in *.ice ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_slicedir)/Glacier2/$$i ; \ + chmod a+r $(install_slicedir)/Glacier2/$$i ; \ done diff --git a/cpp/slice/Ice/Makefile b/cpp/slice/Ice/Makefile index 315933ccdc5..062abb2957e 100644 --- a/cpp/slice/Ice/Makefile +++ b/cpp/slice/Ice/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_slicedir)/Ice ; \ then \ echo "Creating $(install_slicedir)/Ice..." ; \ - mkdir $(install_slicedir)/Ice ; \ - chmod a+rx $(install_slicedir)/Ice ; \ + $(call mkdir,$(install_slicedir)/Ice) ; \ fi @for i in *.ice ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_slicedir)/Ice/$$i ; \ + chmod a+r $(install_slicedir)/Ice/$$i ; \ done diff --git a/cpp/slice/IceBox/Makefile b/cpp/slice/IceBox/Makefile index c4b8b5183e3..c4fcbe5c1ac 100644 --- a/cpp/slice/IceBox/Makefile +++ b/cpp/slice/IceBox/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_slicedir)/IceBox ; \ then \ echo "Creating $(install_slicedir)/IceBox..." ; \ - mkdir $(install_slicedir)/IceBox ; \ - chmod a+rx $(install_slicedir)/IceBox ; \ + $(call mkdir,$(install_slicedir)/IceBox) ; \ fi @for i in *.ice ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_slicedir)/IceBox/$$i ; \ + chmod a+r $(install_slicedir)/IceBox/$$i ; \ done diff --git a/cpp/slice/IcePack/Makefile b/cpp/slice/IcePack/Makefile index dccc104244c..f361e0b6292 100644 --- a/cpp/slice/IcePack/Makefile +++ b/cpp/slice/IcePack/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_slicedir)/IcePack ; \ then \ echo "Creating $(install_slicedir)/IcePack..." ; \ - mkdir $(install_slicedir)/IcePack ; \ - chmod a+rx $(install_slicedir)/IcePack ; \ + $(call mkdir,$(install_slicedir)/IcePack) ; \ fi @for i in *.ice ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_slicedir)/IcePack/$$i ; \ + chmod a+r $(install_slicedir)/IcePack/$$i ; \ done diff --git a/cpp/slice/IcePatch2/Makefile b/cpp/slice/IcePatch2/Makefile index 3bbcd8f1b56..45408eae683 100644 --- a/cpp/slice/IcePatch2/Makefile +++ b/cpp/slice/IcePatch2/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_slicedir)/IcePatch2 ; \ then \ echo "Creating $(install_slicedir)/IcePatch2..." ; \ - mkdir $(install_slicedir)/IcePatch2 ; \ - chmod a+rx $(install_slicedir)/IcePatch2 ; \ + $(call mkdir,$(install_slicedir)/IcePatch2) ; \ fi @for i in *.ice ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_slicedir)/IcePatch2/$$i ; \ + chmod a+r $(install_slicedir)/IcePatch2/$$i ; \ done diff --git a/cpp/slice/IceSSL/Makefile b/cpp/slice/IceSSL/Makefile index 2382d7b3608..191ab1027b6 100644 --- a/cpp/slice/IceSSL/Makefile +++ b/cpp/slice/IceSSL/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_slicedir)/IceSSL ; \ then \ echo "Creating $(install_slicedir)/IceSSL..." ; \ - mkdir $(install_slicedir)/IceSSL ; \ - chmod a+rx $(install_slicedir)/IceSSL ; \ + $(call mkdir,$(install_slicedir)/IceSSL) ; \ fi @for i in *.ice ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_slicedir)/IceSSL/$$i ; \ + chmod a+r $(install_slicedir)/IceSSL/$$i ; \ done diff --git a/cpp/slice/IceStorm/Makefile b/cpp/slice/IceStorm/Makefile index 72d55683ccf..02c2d563d6e 100644 --- a/cpp/slice/IceStorm/Makefile +++ b/cpp/slice/IceStorm/Makefile @@ -15,12 +15,12 @@ install:: @if test ! -d $(install_slicedir)/IceStorm ; \ then \ echo "Creating $(install_slicedir)/IceStorm..." ; \ - mkdir $(install_slicedir)/IceStorm ; \ - chmod a+rx $(install_slicedir)/IceStorm ; \ + $(call mkdir,$(install_slicedir)/IceStorm) ; \ fi @for i in *.ice ; \ do \ echo "Installing $$i" ; \ $(INSTALL_DATA) $$i $(install_slicedir)/IceStorm/$$i ; \ + chmod a+r $(install_slicedir)/IceStorm/$$i ; \ done diff --git a/cpp/src/FreezeScript/Makefile b/cpp/src/FreezeScript/Makefile index 5841d5fc1f4..c4174d98a6a 100644 --- a/cpp/src/FreezeScript/Makefile +++ b/cpp/src/FreezeScript/Makefile @@ -55,7 +55,7 @@ clean:: rm -f Scanner.cpp install:: all - $(INSTALL_PROGRAM) $(TRANSFORMDB) $(install_bindir) - $(INSTALL_PROGRAM) $(DUMPDB) $(install_bindir) + $(call installprogram,$(TRANSFORMDB),$(install_bindir)) + $(call installprogram,$(DUMPDB),$(install_bindir)) include .depend diff --git a/cpp/src/Glacier2/Makefile b/cpp/src/Glacier2/Makefile index 4010e224cc6..826c4a78b45 100644 --- a/cpp/src/Glacier2/Makefile +++ b/cpp/src/Glacier2/Makefile @@ -72,6 +72,6 @@ $(ROUTER): $(ROBJS) $(LIBTARGETS) install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) - $(INSTALL_PROGRAM) $(ROUTER) $(install_bindir) + $(call installprogram,$(ROUTER),$(install_bindir)) include .depend diff --git a/cpp/src/IceBox/Makefile b/cpp/src/IceBox/Makefile index 0603a125d5c..fbd4f1843fe 100644 --- a/cpp/src/IceBox/Makefile +++ b/cpp/src/IceBox/Makefile @@ -65,7 +65,7 @@ $(ADMIN): $(AOBJS) $(LIBTARGETS) install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) - $(INSTALL_PROGRAM) $(SERVER) $(install_bindir) - $(INSTALL_PROGRAM) $(ADMIN) $(install_bindir) + $(call installprogram,$(SERVER),$(install_bindir)) + $(call installprogram,$(ADMIN),$(install_bindir)) include .depend diff --git a/cpp/src/IceGrid/Makefile b/cpp/src/IceGrid/Makefile index 084d4061988..4dac91046ae 100644 --- a/cpp/src/IceGrid/Makefile +++ b/cpp/src/IceGrid/Makefile @@ -220,8 +220,8 @@ clean:: install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) - $(INSTALL_PROGRAM) $(ADMIN) $(install_bindir) - $(INSTALL_PROGRAM) $(NODE_SERVER) $(install_bindir) - $(INSTALL_PROGRAM) $(REGISTRY_SERVER) $(install_bindir) + $(call installprogram,$(ADMIN),$(install_bindir)) + $(call installprogram,$(NODE_SERVER),$(install_bindir)) + $(call installprogram,$(REGISTRY_SERVER),$(install_bindir)) include .depend diff --git a/cpp/src/IcePack/Makefile b/cpp/src/IcePack/Makefile index 7b739d9e851..06fe0368312 100644 --- a/cpp/src/IcePack/Makefile +++ b/cpp/src/IcePack/Makefile @@ -177,8 +177,8 @@ clean:: install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) - $(INSTALL_PROGRAM) $(ADMIN) $(install_bindir) - $(INSTALL_PROGRAM) $(NODE_SERVER) $(install_bindir) - $(INSTALL_PROGRAM) $(REGISTRY_SERVER) $(install_bindir) + $(call installprogram,$(ADMIN),$(install_bindir)) + $(call installprogram,$(NODE_SERVER),$(install_bindir)) + $(call installprogram,$(REGISTRY_SERVER),$(install_bindir)) include .depend diff --git a/cpp/src/IcePatch2/Makefile b/cpp/src/IcePatch2/Makefile index c9ac17f6ff6..7b871504f0f 100644 --- a/cpp/src/IcePatch2/Makefile +++ b/cpp/src/IcePatch2/Makefile @@ -75,8 +75,8 @@ $(CALC): $(CALCOBJS) $(LIBTARGETS) install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) - $(INSTALL_PROGRAM) $(SERVER) $(install_bindir) - $(INSTALL_PROGRAM) $(CLIENT) $(install_bindir) - $(INSTALL_PROGRAM) $(CALC) $(install_bindir) + $(call installprogram,$(SERVER),$(install_bindir)) + $(call installprogram,$(CLIENT),$(install_bindir)) + $(call installprogram,$(CALC),$(install_bindir)) include .depend diff --git a/cpp/src/IceStorm/Makefile b/cpp/src/IceStorm/Makefile index 5e871c5541c..c9600a03096 100644 --- a/cpp/src/IceStorm/Makefile +++ b/cpp/src/IceStorm/Makefile @@ -120,6 +120,6 @@ clean:: install:: all $(call installlib,$(install_libdir),$(libdir),$(LIBFILENAME),$(SONAME),$(LIBNAME)) $(call installlib,$(install_libdir),$(libdir),$(SVCLIBFILENAME),$(SVCSONAME),$(SVCLIBNAME)) - $(INSTALL_PROGRAM) $(ADMIN) $(install_bindir) + $(call installprogram,$(ADMIN),$(install_bindir)) include .depend diff --git a/cpp/src/icecpp/Makefile b/cpp/src/icecpp/Makefile index 76eb2e2b379..f3563bf6c89 100644 --- a/cpp/src/icecpp/Makefile +++ b/cpp/src/icecpp/Makefile @@ -36,7 +36,7 @@ $(NAME): $(OBJS) $(CC) -o $@ $(OBJS) install:: all - $(INSTALL_PROGRAM) $(NAME) $(install_bindir) + $(call installprogram,$(NAME),$(install_bindir)) clean:: rm -f cexp.c diff --git a/cpp/src/slice2cpp/Makefile b/cpp/src/slice2cpp/Makefile index f51cb8b3bbc..ca7a2de48a4 100644 --- a/cpp/src/slice2cpp/Makefile +++ b/cpp/src/slice2cpp/Makefile @@ -27,6 +27,6 @@ $(NAME): $(OBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) install:: all - $(INSTALL_PROGRAM) $(NAME) $(install_bindir) + $(call installprogram,$(NAME),$(install_bindir)) include .depend diff --git a/cpp/src/slice2cs/Makefile b/cpp/src/slice2cs/Makefile index 3a2f4c7ebc8..149dff8d2f7 100644 --- a/cpp/src/slice2cs/Makefile +++ b/cpp/src/slice2cs/Makefile @@ -27,6 +27,6 @@ $(NAME): $(OBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) install:: all - $(INSTALL_PROGRAM) $(NAME) $(install_bindir) + $(call installprogram,$(NAME),$(install_bindir)) include .depend diff --git a/cpp/src/slice2docbook/Makefile b/cpp/src/slice2docbook/Makefile index 6292d14ffd8..b3fbba56d81 100644 --- a/cpp/src/slice2docbook/Makefile +++ b/cpp/src/slice2docbook/Makefile @@ -27,6 +27,6 @@ $(NAME): $(OBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) install:: all - $(INSTALL_PROGRAM) $(NAME) $(install_bindir) + $(call installprogram,$(NAME),$(install_bindir)) include .depend diff --git a/cpp/src/slice2freeze/Makefile b/cpp/src/slice2freeze/Makefile index 32800e36021..df51490019d 100644 --- a/cpp/src/slice2freeze/Makefile +++ b/cpp/src/slice2freeze/Makefile @@ -26,6 +26,6 @@ $(NAME): $(OBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) install:: all - $(INSTALL_PROGRAM) $(NAME) $(install_bindir) + $(call installprogram,$(NAME),$(install_bindir)) include .depend diff --git a/cpp/src/slice2freezej/Makefile b/cpp/src/slice2freezej/Makefile index 89b0650f96f..5372bf5dd69 100644 --- a/cpp/src/slice2freezej/Makefile +++ b/cpp/src/slice2freezej/Makefile @@ -26,6 +26,6 @@ $(NAME): $(OBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) install:: all - $(INSTALL_PROGRAM) $(NAME) $(install_bindir) + $(call installprogram,$(NAME),$(install_bindir)) include .depend diff --git a/cpp/src/slice2java/Makefile b/cpp/src/slice2java/Makefile index 14e5e857e52..b3ce2524edc 100644 --- a/cpp/src/slice2java/Makefile +++ b/cpp/src/slice2java/Makefile @@ -27,6 +27,6 @@ $(NAME): $(OBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) install:: all - $(INSTALL_PROGRAM) $(NAME) $(install_bindir) + $(call installprogram,$(NAME),$(install_bindir)) include .depend diff --git a/cpp/src/slice2py/Makefile b/cpp/src/slice2py/Makefile index 4da4422aa67..865defdcd67 100644 --- a/cpp/src/slice2py/Makefile +++ b/cpp/src/slice2py/Makefile @@ -26,6 +26,6 @@ $(NAME): $(OBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) install:: all - $(INSTALL_PROGRAM) $(NAME) $(install_bindir) + $(call installprogram,$(NAME),$(install_bindir)) include .depend diff --git a/cpp/src/slice2vb/Makefile b/cpp/src/slice2vb/Makefile index c8b2f3bf8c8..dcefff6f9b0 100644 --- a/cpp/src/slice2vb/Makefile +++ b/cpp/src/slice2vb/Makefile @@ -27,6 +27,6 @@ $(NAME): $(OBJS) $(CXX) $(LDFLAGS) -o $@ $(OBJS) -lSlice $(BASELIBS) install:: all - $(INSTALL_PROGRAM) $(NAME) $(install_bindir) + $(call installprogram,$(NAME),$(install_bindir)) include .depend |