Merge branch 'master' into cmake

config/Imake.rules

@@ -243,14 +243,11 @@ PREFIX(COMMONLIBS) += DepSharedLibraryTargetName(directory,libname) BuildRPath/*
 include $(CASTOR_ROOT)/directory/Makefile
 
 
-#define LOGROTATE(file,tgt)                             \
-ifndef $(DESTDIR)/etc/logrotate.d/file                @@\
-  $(DESTDIR)/etc/logrotate.d/file = 1                 @@\
-$(DESTDIR)/etc/logrotate.d/file: $(CASTOR_ROOT)/debian/file.logrotate @@\
-	install -d $(DESTDIR)/etc/logrotate.d -m 0755 @@\
-	install $< $@                                 @@\
-tgt: $(DESTDIR)/etc/logrotate.d/file                  @@\
-endif
+#define LOGROTATE(file,tgt)                                  \
+$(DESTDIR)/etc/logrotate.d/file: LOCAL_PATH/file.logrotate @@\
+	install -d $(DESTDIR)/etc/logrotate.d -m 0755      @@\
+	install $< $@                                      @@\
+tgt: $(DESTDIR)/etc/logrotate.d/file
 
 #define internalSYSCONFIG(destfile,origfile,tgt)         \
 $(DESTDIR)/etc/sysconfig/destfile: LOCAL_PATH/origfile @@\

gridftp2/Imakefile

@@ -24,6 +24,7 @@ COMM
 COMM @author castor-dev team
 COMM
 
+include LOCAL_PATH/common/Makefile
 include LOCAL_PATH/internal/Makefile
 include LOCAL_PATH/external/Makefile
 include LOCAL_PATH/xroot/Makefile

gridftp2/common/Imakefile

+COMM
+COMM                    gridftp2/common/Imakefile
+COMM
+COMM This file is part of the Castor project.
+COMM See http://castor.web.cern.ch/castor
+COMM
+COMM Copyright (C) 2003  CERN
+COMM This program is free software; you can redistribute it and/or
+COMM modify it under the terms of the GNU General Public License
+COMM as published by the Free Software Foundation; either version 2
+COMM of the License, or (at your option) any later version.
+COMM This program is distributed in the hope that it will be useful,
+COMM but WITHOUT ANY WARRANTY; without even the implied warranty of
+COMM MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+COMM GNU General Public License for more details.
+COMM You should have received a copy of the GNU General Public License
+COMM along with this program; if not, write to the Free Software
+COMM Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+COMM
+COMM
+COMM Make Castor Oracle library for CDBC API
+COMM
+COMM @author castor-dev@cern.ch
+COMM
+
+LOGROTATE(castor-gridftp-dsi-common,install)
+MakeDir(/var/log,0755)

gridftp2/external/Imakefile

@@ -37,5 +37,3 @@ DependsOnLibrary(castor,castorclient)
 DependsOnLibrary(rfio,castorrfio)
 PlacedSharedLibraryTargetWithSo(globus_gridftp_server_CASTOR2ext,globus_gridftp_server_CASTOR2ext.o,,,$(GLOBUS_LIB_PATH))
 InstallNonExecFile(gsiftp,/etc/xinetd.d,644)
-LOGROTATE(castor-gridftp-dsi-common,install)
-MakeDir(/var/log,0755)

gridftp2/internal/Imakefile

@@ -33,5 +33,3 @@ CFLAGS += $(MOPTION) -fPIC
 AddLdFlags($(GLOBUS_FTPLIB) $(MOPTION) -shared -lz)
 
 PlacedSharedLibraryTargetWithSo(globus_gridftp_server_CASTOR2int,globus_gridftp_server_CASTOR2int.o,,,$(GLOBUS_LIB_PATH))
-LOGROTATE(castor-gridftp-dsi-common,install)
-MakeDir(/var/log,0755)

gridftp2/xroot/Imakefile

@@ -47,6 +47,3 @@ COMM that should not be set on other components on 32 bits platforms so cannot b
 COMM to CPPFLAGS.
 COMM This part can be removed when 32 bits support will be dropped
 COMPILECPP(globus_gridftp_server_CASTOR2xroot.cpp,-Wno-error -D_FILE_OFFSET_BITS=64)
-
-LOGROTATE(castor-gridftp-dsi-common,install)
-MakeDir(/var/log,0755)