From 1adb53e896797c73b5528ee178bd73ff51be2c43 Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Fri, 11 Jan 2013 21:46:06 +0200 Subject: [PATCH] Fixed installation. --- projects/convertor/Makefile | 15 +++++++++++++++ projects/convertor/build | 2 ++ projects/rlm_stg/Makefile | 6 +++++- projects/rlm_stg/build | 4 ++++ projects/rscriptd/Makefile | 6 +++++- projects/rscriptd/build | 4 ++++ projects/sgauth/Makefile | 6 +++++- projects/sgauth/build | 4 ++++ projects/sgconf/Makefile | 6 +++++- projects/sgconf/build | 4 ++++ projects/sgconf_xml/Makefile | 6 +++++- projects/sgconf_xml/build | 4 ++++ projects/stargazer/Makefile | 6 +++++- projects/stargazer/build | 4 ++++ projects/stargazer/plugins/Makefile.in | 6 +++++- stglibs/Makefile.in | 7 +++++-- 16 files changed, 81 insertions(+), 9 deletions(-) diff --git a/projects/convertor/Makefile b/projects/convertor/Makefile index efacbb64..04c00cc4 100644 --- a/projects/convertor/Makefile +++ b/projects/convertor/Makefile @@ -58,6 +58,21 @@ clean: distclean: clean rm -f ../../Makefile.conf +install: install-bin + +install-bin: +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG) +else + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG) +endif + $(MAKE) -C $(DIR_PLUGINS) install + +uninstall: uninstall-bin + +uninstall-bin: + rm -f $(PREFIX)/usr/bin/$(PROG) + ifneq ($(MAKECMDGOALS),distclean) ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),uninstall) diff --git a/projects/convertor/build b/projects/convertor/build index 0144b0f1..471ee62c 100755 --- a/projects/convertor/build +++ b/projects/convertor/build @@ -20,6 +20,7 @@ DEFS="-DDEBUG" MAKEOPTS="-j1" CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall -I/usr/local/include" LDFLAGS="$LDFLAGS -L/usr/local/lib" +DEBUG="yes" if [ "$sys" = "Linux" ] then @@ -251,6 +252,7 @@ fi echo "OS=$OS" > $CONFFILE echo "STG_TIME=yes" >> $CONFFILE +echo "DEBUG=$DEBUG" >> $CONFFILE echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE diff --git a/projects/rlm_stg/Makefile b/projects/rlm_stg/Makefile index 98f5f2d2..faa8aa30 100644 --- a/projects/rlm_stg/Makefile +++ b/projects/rlm_stg/Makefile @@ -57,7 +57,11 @@ distclean: clean install: install-bin install-bin: - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG) +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/$(PROG) +else + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/$(PROG) +endif $(MAKE) -C $(DIR_LIBSRC) install uninstall: uninstall-bin diff --git a/projects/rlm_stg/build b/projects/rlm_stg/build index 0145d038..3781d1b4 100755 --- a/projects/rlm_stg/build +++ b/projects/rlm_stg/build @@ -19,14 +19,17 @@ OWNER=root if [ -z $1 ] then MAKEOPTS="-j1" + DEBUG="no" else if [ "$1" = "debug" ] then DEFS="-DDEBUG" MAKEOPTS="-j1" CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" + DEBUG="yes" else MAKEOPTS="-j1" + DEBUG="no" fi fi @@ -144,6 +147,7 @@ rm -f fake echo "OS=$OS" > $CONFFILE echo "STG_TIME=yes" >> $CONFFILE +echo "DEBUG=$DEBUG" >> $CONFFILE echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE diff --git a/projects/rscriptd/Makefile b/projects/rscriptd/Makefile index 0912be08..da06b50b 100644 --- a/projects/rscriptd/Makefile +++ b/projects/rscriptd/Makefile @@ -57,7 +57,11 @@ distclean: clean install: install-bin install-data install-bin: - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG) +else + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +endif $(MAKE) -C $(DIR_LIBSRC) install install-data: diff --git a/projects/rscriptd/build b/projects/rscriptd/build index 885eef76..6a7c77f1 100755 --- a/projects/rscriptd/build +++ b/projects/rscriptd/build @@ -19,14 +19,17 @@ OWNER=root if [ -z $1 ] then MAKEOPTS="-j1" + DEBUG="no" else if [ "$1" = "debug" ] then DEFS="-DDEBUG" MAKEOPTS="-j1" CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" + DEBUG="yes" else MAKEOPTS="-j1" + DEBUG="no" fi fi @@ -150,6 +153,7 @@ rm -f build_check.c echo "OS=$OS" > $CONFFILE echo "STG_TIME=yes" >> $CONFFILE +echo "DEBUG=$DEBUG" >> $CONFFILE echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE diff --git a/projects/sgauth/Makefile b/projects/sgauth/Makefile index 99cd0e47..a59371c9 100644 --- a/projects/sgauth/Makefile +++ b/projects/sgauth/Makefile @@ -58,7 +58,11 @@ distclean: clean install: install-bin install-data install-bin: - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG) +else + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +endif $(MAKE) -C $(DIR_LIBSRC) install install-data: diff --git a/projects/sgauth/build b/projects/sgauth/build index ec747e2a..e3ad87f4 100755 --- a/projects/sgauth/build +++ b/projects/sgauth/build @@ -19,14 +19,17 @@ OWNER=root if [ -z $1 ] then MAKEOPTS="-j1" + DEBUG="no" else if [ "$1" = "debug" ] then DEFS="-DDEBUG" MAKEOPTS="-j1" CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" + DEBUG="yes" else MAKEOPTS="-j1" + DEBUG="no" fi fi @@ -148,6 +151,7 @@ rm -f build_check.c echo "OS=$OS" > $CONFFILE echo "STG_TIME=yes" >> $CONFFILE +echo "DEBUG=$DEBUG" >> $CONFFILE echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE diff --git a/projects/sgconf/Makefile b/projects/sgconf/Makefile index 4d62bb53..297d3e20 100644 --- a/projects/sgconf/Makefile +++ b/projects/sgconf/Makefile @@ -66,7 +66,11 @@ distclean: clean install: install-bin install-bin: - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG) +else + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG) +endif $(MAKE) -C $(DIR_LIBSRC) install uninstall: uninstall-bin diff --git a/projects/sgconf/build b/projects/sgconf/build index 1f6c0a0c..da81773a 100755 --- a/projects/sgconf/build +++ b/projects/sgconf/build @@ -19,14 +19,17 @@ OWNER=root if [ -z $1 ] then MAKEOPTS="-j1" + DEBUG="no" else if [ "$1" = "debug" ] then DEFS="-DDEBUG" MAKEOPTS="-j1" CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" + DEBUG="yes" else MAKEOPTS="-j1" + DEBUG="no" fi fi @@ -166,6 +169,7 @@ fi echo "OS=$OS" > $CONFFILE echo "STG_TIME=yes" >> $CONFFILE +echo "DEBUG=$DEBUG" >> $CONFFILE echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE diff --git a/projects/sgconf_xml/Makefile b/projects/sgconf_xml/Makefile index b7ebca0a..32384e62 100644 --- a/projects/sgconf_xml/Makefile +++ b/projects/sgconf_xml/Makefile @@ -66,7 +66,11 @@ distclean: clean install: install-bin install-data install-bin: - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/bin/$(PROG) +endif + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/bin/$(PROG) +else $(MAKE) -C $(DIR_LIBSRC) install uninstall: uninstall-bin uninstall-data diff --git a/projects/sgconf_xml/build b/projects/sgconf_xml/build index f78e6f70..97970758 100755 --- a/projects/sgconf_xml/build +++ b/projects/sgconf_xml/build @@ -19,14 +19,17 @@ OWNER=root if [ -z $1 ] then MAKEOPTS="-j1" + DEBUG="no" else if [ "$1" = "debug" ] then DEFS="-DDEBUG" MAKEOPTS="-j1" CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" + DEBUG="yes" else MAKEOPTS="-j1" + DEBUG="no" fi fi @@ -166,6 +169,7 @@ fi echo "OS=$OS" > $CONFFILE echo "STG_TIME=yes" >> $CONFFILE +echo "DEBUG=$DEBUG" >> $CONFFILE echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE diff --git a/projects/stargazer/Makefile b/projects/stargazer/Makefile index 44ae35ec..9dfc0b51 100644 --- a/projects/stargazer/Makefile +++ b/projects/stargazer/Makefile @@ -77,7 +77,11 @@ distclean: clean install: install-bin install-data install-bin: $(PROG) - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/sbin/$(PROG) +else + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/sbin/$(PROG) +endif $(MAKE) -C $(DIR_INCLUDE) install $(MAKE) -C $(DIR_LIBSRC) install $(MAKE) -C $(DIR_PLUGINS) install diff --git a/projects/stargazer/build b/projects/stargazer/build index c58b9697..8a34c4fc 100755 --- a/projects/stargazer/build +++ b/projects/stargazer/build @@ -39,15 +39,18 @@ if [ -z "$1" ] then DEFS="$DEFS -DNDEBUG" MAKEOPTS="-j1" + DEBUG="no" else if [ "$1" = "debug" ] then DEFS="$DEFS -DDEBUG" MAKEOPTS="-j1" CXXFLAGS="$CXXFLAGS -ggdb3 -W -Wall" + DEBUG="yes" else DEFS="$DEFS -DNDEBUG" MAKEOPTS="-j1" + DEBUG="no" fi fi @@ -391,6 +394,7 @@ fi echo "OS=$OS" > $CONFFILE echo "STG_TIME=yes" >> $CONFFILE +echo "DEBUG=$DEBUG" >> $CONFFILE echo "DIR_BUILD=$BUILD_DIR" >> $CONFFILE echo "DIR_LIB=\$(DIR_BUILD)/../../lib" >> $CONFFILE echo "DIR_LIBSRC=\$(DIR_BUILD)/../../stglibs" >> $CONFFILE diff --git a/projects/stargazer/plugins/Makefile.in b/projects/stargazer/plugins/Makefile.in index 49306854..70954a2a 100644 --- a/projects/stargazer/plugins/Makefile.in +++ b/projects/stargazer/plugins/Makefile.in @@ -28,7 +28,11 @@ clean: install: $(PROG) mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) +else + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) +endif uninstall: rm -f $(PREFIX)/usr/lib/stg/$(PROG) diff --git a/stglibs/Makefile.in b/stglibs/Makefile.in index a3184974..b5d1195c 100644 --- a/stglibs/Makefile.in +++ b/stglibs/Makefile.in @@ -35,8 +35,11 @@ clean: rm -f deps $(PROG) *.o *.a *.so tags *.*~ install: $(PROG) - mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/lib/stg - install -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) +ifeq ($(DEBUG), yes) + install -D -m $(BIN_MODE) -o $(OWNER) $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) +else + install -D -m $(BIN_MODE) -o $(OWNER) -s $(PROG) $(PREFIX)/usr/lib/stg/$(PROG) +endif mkdir -m $(DIR_MODE) -p $(PREFIX)/usr/include/stg install -m $(DATA_MODE) -o $(OWNER) $(addprefix include/stg/,$(INCS)) $(PREFIX)/usr/include/stg/ -- 2.44.2