From: hades <hades>
Date: Fri, 11 Aug 2000 13:39:43 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: https://jspc29.x-matter.uni-frankfurt.de/git/?a=commitdiff_plain;h=aa9bef5aa62a632ee23863bda99fcc1a870aa8c0;p=daqdata.git

*** empty log message ***
---

diff --git a/allParam/Makefile b/allParam/Makefile
index d5ccdcc..7b8c724 100644
--- a/allParam/Makefile
+++ b/allParam/Makefile
@@ -1,4 +1,7 @@
-LIBDIR = $(HOME)/lib
+#LIBDIR = /usr/local/lib/
+#INCLUDEDIR = /usr/local/include
+
+LIBDIR = $(HOME)/lib/
 INCLUDEDIR = $(HOME)/include
 
 ARFLAGS = -rc
@@ -18,14 +21,20 @@ $(patsubst %,lib%.a,$(PARAMLIBES)) :
 $(patsubst %,%Param.o,$(CXXPARAMOBJS)) :
 	cd $(dir $@) ; $(MAKE) $(notdir $@)
 
-install : $(patsubst %Param,install_%,$(PARAMLIBES))
+install : install_c install_cxx
+
+install_c : $(patsubst %Param,install_%,$(PARAMLIBES))
+
+install_cxx : libcxxParam.a
+	install libcxxParam.a $(LIBDIR)
+	$(patsubst %,install -m 644 %Param.h $(INCLUDEDIR) ;,$(CXXPARAMOBJS))
 
 $(patsubst %Param,install_%,$(PARAMLIBES)) : \
   $(patsubst install_%,lib%Param.a,$@)
 	install \
 	$(patsubst install_%,%,$@)/lib$(patsubst install_%,%,$@)Param.a $(LIBDIR)
 	install -d $(INCLUDEDIR)/$(patsubst install_%,%,$@)
-	install $(patsubst install_%,%,$@)/param.h \
+	install -m 644 $(patsubst install_%,%,$@)/param.h \
 	$(INCLUDEDIR)/$(patsubst install_%,%,$@)
 
 clean :
diff --git a/allParam/ora/Makefile b/allParam/ora/Makefile
index edf69b6..8468a06 100644
--- a/allParam/ora/Makefile
+++ b/allParam/ora/Makefile
@@ -1,6 +1,11 @@
 CXXFLAGS = -g -I../param -I$(ORACLE_HOME)/precomp/public/
+
 ORACLE_HOME = /usr/local/oracle/product/8.0.5
+ORA_USER = hades/hades@db-hades.gsi.de
+
 PROC = $(ORACLE_HOME)/bin/proc
+PROCFLAGS = oraca=yes code=cpp parse=partial sqlcheck=semantics \
+  userid=$(ORA_USER) ireclen=130 oreclen=130
 
 PROC_INCLUDES = include=/usr/include include=/usr/include/g++-2 \
   include=$(ORACLE_HOME)/precomp/public \
@@ -12,8 +17,7 @@ PROC_INCLUDES = include=/usr/include include=/usr/include/g++-2 \
 oraParam.o : oraParam.cc oraParam.h ../param/enhParam.h
 
 oraParam.cc : oraParam.pc
-	cp $< $@
-#	$(PROC) $(PROCINCLUDES) iname=$< oname=$@
+	$(PROC) $(PROCFLAGS) $(PROC_INCLUDES) iname=$< oname=$@
 
 clean :
 	rm -f *.o oraParam.cc oraParam.lis