diff -ur lcgdm-1.7.4.4.orig/config/site.def lcgdm-1.7.4.4/config/site.def
--- lcgdm-1.7.4.4.orig/config/site.def 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/config/site.def 2010-03-29 19:27:36.803627866 +0200
@@ -29,7 +29,7 @@
#define CupvConfigFile /etc/CUPVCONFIG
#endif
#define CupvHost "UNUSED"
-#define CupvSpool /usr/spool/upv
+#define CupvSpool /var/spool/upv
#define DicomcopySpool /var/log/dicomcopy
#define DliSpool /var/log/dli
#define DomainName cern.ch
@@ -73,12 +73,12 @@
#if defined(_WIN32)
#define InstallPerlDir \\cern.ch\dfs\Applications\CERN\LFC\lib\perl
#else
-#define InstallPerlDir $(prefix)/$(_lib)/perl
+#define InstallPerlDir $(shell perl -MConfig -e '$$x = $$Config{vendorarchexp}; $$x =~ s!$$Config{prefix}!$(prefix)! ; print $$x')
#endif
#if defined(_WIN32)
#define InstallPythonDir \\cern.ch\dfs\Applications\CERN\LFC\lib\python
#else
-#define InstallPythonDir $(prefix)/$(_lib)/python
+#define InstallPythonDir $(shell python -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,'$(prefix)')")
#endif
#define LibManDir $(prefix)/share/man/man3
#define LibManSuffix 3
@@ -119,7 +119,7 @@
#define RemoteHostsList /etc/shift.remhosts
#endif
#define RfioSpool /var/log/rfio
-#define SacctDir /usr/spool/sacct
+#define SacctDir /var/spool/sacct
#if defined(_WIN32)
#define ShiftConfigFile %%SystemRoot%%\\system32\\drivers\\etc\\shift.conf
#else
diff -ur lcgdm-1.7.4.4.orig/configure lcgdm-1.7.4.4/configure
--- lcgdm-1.7.4.4.orig/configure 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/configure 2010-03-29 19:27:36.804794633 +0200
@@ -177,6 +177,19 @@
$SITE_DEF >$SITE_DEF.new
mv $SITE_DEF.new $SITE_DEF
;;
+ --with-sysconf-dir*)
+ if [ '--with-sysconf-dir' = "$1" ]; then
+ location="$2"
+ shift
+ else
+ location=`echo $1 | cut -d= -f 2`
+ fi
+ shift
+ [ 'yes' = "$VERBOSE" ] && echo "Sysconf dir: $location"
+ sed -e "s# SysconfDir\ .*\$# SysconfDir $location#" \
+ $SITE_DEF >$SITE_DEF.new
+ mv $SITE_DEF.new $SITE_DEF
+ ;;
--with-gsoap-location*)
if [ '--with-gsoap-location' = "$1" ]; then
location="$2"
diff -ur lcgdm-1.7.4.4.orig/dpm/Imakefile lcgdm-1.7.4.4/dpm/Imakefile
--- lcgdm-1.7.4.4.orig/dpm/Imakefile 2010-03-29 16:21:44.000000000 +0200
+++ lcgdm-1.7.4.4/dpm/Imakefile 2010-03-29 19:27:36.804794633 +0200
@@ -242,14 +242,14 @@
_dpm2.so \
dpm2.py
IDPM_IFCE = $(PERLDIR) \
- $(PYTHONDIR)$(PYTHON_VERSION)/site-packages \
+ $(PYTHONDIR) \
FileName($(BIN),ProgramTargetName(dpm-listspaces)) \
FileName($(PERLDIR),dpm.so) \
FileName($(PERLDIR),dpm.pm) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_dpm.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,dpm.py) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_dpm2.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,dpm2.py)
+ FileName($(PYTHONDIR),_dpm.so) \
+ FileName($(PYTHONDIR),dpm.py) \
+ FileName($(PYTHONDIR),_dpm2.so) \
+ FileName($(PYTHONDIR),dpm2.py)
#endif
DPMLIB_OBJS = dpm_abortfiles.Osuf \
@@ -436,10 +436,10 @@
InstallTarget(dpm.so,root,root,0755,$(PERLDIR))
InstallTarget(dpm.pm,root,root,0644,$(PERLDIR))
-InstallTarget(_dpm.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(dpm.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(_dpm2.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(dpm2.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
+InstallTarget(_dpm.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(dpm.py,root,root,0644,$(PYTHONDIR))
+InstallTarget(_dpm2.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(dpm2.py,root,root,0644,$(PYTHONDIR))
InstallProgram(dpm-listspaces,$(BIN),root,bin,755)
MakeDir($(BIN),root,bin,0755)
@@ -452,7 +452,7 @@
#if BuildInterfaces
MakeDir($(PERLDIR),root,root,0755)
-MakeDir($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,root,root,0755)
+MakeDir($(PYTHONDIR),root,root,0755)
#endif
install.man: $(MANDIRS) $(MANPAGESCLIENT) $(MANPAGESSERVER) $(MANPAGESIFCE)
diff -ur lcgdm-1.7.4.4.orig/ns/Imakefile.lfc lcgdm-1.7.4.4/ns/Imakefile.lfc
--- lcgdm-1.7.4.4.orig/ns/Imakefile.lfc 2010-03-29 16:21:47.000000000 +0200
+++ lcgdm-1.7.4.4/ns/Imakefile.lfc 2010-03-29 19:27:36.805795737 +0200
@@ -240,17 +240,17 @@
_lfc2thr.so\
lfc2thr.py
ILFC_IFCE = $(PERLDIR) \
- $(PYTHONDIR)$(PYTHON_VERSION)/site-packages \
+ $(PYTHONDIR) \
FileName($(PERLDIR),lfc.so) \
FileName($(PERLDIR),lfc.pm) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfc.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfc.py) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfcthr.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfcthr.py) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfc2.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfc2.py) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,_lfc2thr.so) \
- FileName($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,lfc2thr.py)
+ FileName($(PYTHONDIR),_lfc.so) \
+ FileName($(PYTHONDIR),lfc.py) \
+ FileName($(PYTHONDIR),_lfcthr.so) \
+ FileName($(PYTHONDIR),lfcthr.py) \
+ FileName($(PYTHONDIR),_lfc2.so) \
+ FileName($(PYTHONDIR),lfc2.py) \
+ FileName($(PYTHONDIR),_lfc2thr.so) \
+ FileName($(PYTHONDIR),lfc2thr.py)
#endif
NSDAEMON_OBJS = Cns_main.Osuf \
@@ -477,8 +477,8 @@
InstallTarget(lfc.so,root,root,0755,$(PERLDIR))
InstallTarget(lfc.pm,root,root,0644,$(PERLDIR))
-InstallTarget(_lfc.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfc.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
+InstallTarget(_lfc.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(lfc.py,root,root,0644,$(PYTHONDIR))
lfc2.py : _lfc2.so
_lfc2.so : lfc2.i ../h/lfc_api.h ../h/Cns_api.h
@@ -487,8 +487,8 @@
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2_wrap.c
$(LD) $(SHLIBLDFLAGS) -o _lfc2.so lfc2_wrap.o $(LIBS) -llfc
-InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
+InstallTarget(_lfc2.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(lfc2.py,root,root,0644,$(PYTHONDIR))
lfcthr.py : _lfcthr.so
_lfcthr.so : lfcthr.i ../h/lfc_api.h ../h/Cns_api.h
@@ -497,8 +497,8 @@
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfcthr_wrap.c
$(LD) $(SHLIBLDFLAGS) -o _lfcthr.so lfcthr_wrap.o $(LIBS) -llfc
-InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
+InstallTarget(_lfcthr.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(lfcthr.py,root,root,0644,$(PYTHONDIR))
lfc2thr.py : _lfc2thr.so
_lfc2thr.so : lfc2thr.i ../h/lfc_api.h ../h/Cns_api.h
@@ -507,12 +507,12 @@
$(CC) -c $(MTCCFLAGS) -I$(INCLUDES) -DNSTYPE_LFC $(INCLUDE_PYTHON) lfc2thr_wrap.c
$(LD) $(SHLIBLDFLAGS) -o _lfc2thr.so lfc2thr_wrap.o $(LIBS) -llfc
-InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
-InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR)$(PYTHON_VERSION)/site-packages)
+InstallTarget(_lfc2thr.so,root,root,0755,$(PYTHONDIR))
+InstallTarget(lfc2thr.py,root,root,0644,$(PYTHONDIR))
#if BuildInterfaces
MakeDir($(PERLDIR),root,root,0755)
-MakeDir($(PYTHONDIR)$(PYTHON_VERSION)/site-packages,root,root,0755)
+MakeDir($(PYTHONDIR),root,root,0755)
#endif
install.man: $(MANDIRS) $(MANPAGESCLIENT) $(MANPAGESLIBRARY) $(MANPAGESSERVER) $(MANPAGESIFCE)