bin, make, scripts: Copy scripts to $(MODDIR)/bin

bin/Makefile

@@ -0,0 +1,45 @@
+########################################################################
+#                                                                      #
+# development utilities                                                #
+# (c) 2001 jannet it services                                          #
+# Authors: Jan Lindemann                                               #
+# contact@jannet.de                                                    #
+# patches, bugfixes and comments are welcome at patch@jannet.de        #
+#                                                                      #
+# $Id$
+#                                                                      #
+# This program is free software; permission to use, copy, modify,      #
+# distribute, and sell this software and its documentation under the   #
+# terms of the GNU Public license as published by the Free Software    #
+# Foundation, either version 2 or any later version of the license, is #
+# hereby granted without fee, provided that (i) the above copyright    #
+# notices and this permission notice appear in all copies of the       #
+# software and related documentation, and (ii) the name of jannet may  #
+# not be used in any advertising or publicity relating to the software #
+# without the specific, prior written permission of jannet.            #
+#                                                                      #
+# This program is distributed in the hope that it will be useful, but  #
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHAN-  #
+# TABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General    #
+# Public License for more details.                                     #
+#                                                                      #
+# You should have received a copy of the GNU General Public License    #
+# along with this program; if not, write to the Free Software Founda-  #
+# tion, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.                  #
+#                                                                      #
+########################################################################
+
+MODDIR  = ..
+
+CLEAN += $(wildcard *.sh)
+
+include $(MODDIR)/make/scripts.mk
+
+all:
+
+$(INSTALL_BINDIR):
+	$(INSTALL) -o root -g root -m 755 -d $@
+
+install: $(INSTALL_BINDIR) $(INSTALLED_EXE_SH)
+
+profclean:

make/defs-orig.mk

@@ -69,7 +69,8 @@ OBJ         = $(patsubst %.cpp,%.o,$(patsubst %.cc,%.o,$(patsubst %.c,%.o,$(CALL
 SHOBJS       = $(patsubst %.cpp,%.o,$(patsubst %.cc,lib%.so,$(patsubst %.c,lib%.so,$(CALLSRC))))
 SHSCRIPTS    = $(patsubst %.sh.tmpl,%.sh,$(wildcard *.sh.tmpl))
 SCRIPTS      = $(patsubst %.tmpl,%,$(wildcard *.tmpl))
-INST_HDRS   = $(patsubst %.h,$(TOPDIR)/include/%.h,$(wildcard *.h))
+LOCAL_HDR    = $(patsubst %.h,$(TOPDIR)/include/%.h,$(wildcard *.h))
+LOCAL_EXE_SH = $(patsubst %.sh,$(TOPDIR)/bin/%.sh,$(wildcard *.sh))
 
 LOCAL_H      = $(wildcard *.h)
 LOCAL_C      = $(wildcard *.c)
@@ -192,7 +193,7 @@ RM         = rm
 AR         = ar
 
 ifneq ($(wildcard $(MODDIR)/devutil/scripts),)
-MOD_SCRIPT_DIR = $(MODDIR)/devutil/scripts
+MOD_SCRIPT_DIR = $(MODDIR)/bin
 else
 MOD_SCRIPT_DIR = $(MODDIR)/bin
 endif

make/header.mk

@@ -4,7 +4,7 @@
 # $Id$
 
 include $(MODDIR)/make/defs.mk
-ALL += $(LIBDIR) $(PREREQ_DONE) $(INST_HDRS)
+ALL += $(LIBDIR) $(PREREQ_DONE) $(LOCAL_HDR)
 include $(MODDIR)/make/rules.mk
 clean: objclean textclean localclean
 install: $(ALL)

make/rules.mk

@@ -46,6 +46,9 @@ $(TOPDIR)/include:
 $(TOPDIR)/include/%.h: %.h
 	mkdir -p $(dir $@); cp $(@F) $@
 
+$(TOPDIR)/bin/%.sh: %.sh
+	mkdir -p $(dir $@); cp $(@F) $@
+
 %.o: %.cpp
 	$(CPP) $(CPPFLAGS) -c $<
 

make/scripts.mk

@@ -3,7 +3,7 @@
 # contact@jannet.de
 # $Id$
 
-ALL += $(SCRIPTS)
+ALL += $(SCRIPTS) $(LOCAL_EXE_SH)
 include $(MODDIR)/make/defs.mk
 include $(MODDIR)/make/rules.mk
 clean:allclean localclean doneclean textclean

make/tools.mk

@@ -4,7 +4,7 @@
 # $Id$
 
 include $(MODDIR)/make/defs.mk
-ALL += $(LIBDIR) $(PREREQ_DONE) $(INST_HDRS) $(MEMBERS)
+ALL += $(LIBDIR) $(PREREQ_DONE) $(LOCAL_HDR) $(LOCAL_EXE_SH) $(MEMBERS) 
 include $(MODDIR)/make/rules.mk
 clean: objclean textclean localclean
 install: $(ALL)

scripts/Makefile

@@ -38,8 +38,8 @@ include $(MODDIR)/make/scripts.mk
 
 all:
 
-$(INSTALL_BINDIR):
+#$(INSTALL_BINDIR):
-	$(INSTALL) -o root -g root -m 755 -d $@
+#	$(INSTALL) -o root -g root -m 755 -d $@
 
 #install: $(EXEDIR) $(CONFDIR)
 #	$(INSTALL) *.sh -m 755 $(EXEDIR)/
@@ -48,6 +48,6 @@ $(INSTALL_BINDIR):
 #clean distclean libclean:
 #	rm -rf *~ .*.swp core *.rep
 
-install: $(INSTALL_BINDIR) $(INSTALLED_EXE_SH)
+install: all $(INSTALL_BINDIR) $(INSTALLED_EXE_SH)
 
 profclean: