File singular-fhs.diff of Package singular

Overview Repositories Revisions Requests Users Attributes Meta

File singular-fhs.diff of Package singular (Revision 5ff6ae6e708004551252afabe7c7e320)

Currently displaying revision 5ff6ae6e708004551252afabe7c7e320 , Show latest

parent 25b6c088165b989f423de74cdee9d30fa04c99fe ()
commit 18a3fcb5e0bc9310e4c598cc0547bb792297b9f4
Author: Jan Engelhardt <jengelh@medozas.de>
Date:   Mon Jan 2 10:39:27 2012 +0100

build: put modules into the right place

libexecdir is for auxiliary programs and plugins used by programs, but
it is not for plugins potentially used by a shared library, since that
shared library (libpolys.so in this case) may exist in more than one
form (e.g. /usr/lib/x86_64-linux-gnu and /usr/lib/i386-linux-gnu), but
the plugins won't (can't) if they are in /usr/libexec.
---
 dyn_modules/bigintm/Makefile.am  |    2 +-
 dyn_modules/syzextra/Makefile.am |    2 +-
 findexec/Makefile.am             |    2 +-
 findexec/feResource.cc           |    9 ++-------
 libpolys/polys/Makefile.am       |    5 ++---
 5 files changed, 7 insertions(+), 13 deletions(-)

Index: Sources/dyn_modules/bigintm/Makefile.am
===================================================================
--- Sources.orig/dyn_modules/bigintm/Makefile.am
+++ Sources/dyn_modules/bigintm/Makefile.am
@@ -1,4 +1,4 @@
-moduledir = $(bindir)/MOD
+moduledir = ${libdir}/${PACKAGE_NAME}/MOD
 
 if ENABLE_P_PROCS_DYNAMIC
   module_LTLIBRARIES=bigintm.la bigintm_g.la 
Index: Sources/dyn_modules/syzextra/Makefile.am
===================================================================
--- Sources.orig/dyn_modules/syzextra/Makefile.am
+++ Sources/dyn_modules/syzextra/Makefile.am
@@ -1,4 +1,4 @@
-moduledir = $(bindir)/MOD
+moduledir = ${libdir}/${PACKAGE_NAME}/MOD
 
 if ENABLE_P_PROCS_DYNAMIC
   module_LTLIBRARIES=syzextra.la syzextra_g.la 
Index: Sources/findexec/Makefile.am
===================================================================
--- Sources.orig/findexec/Makefile.am
+++ Sources/findexec/Makefile.am
@@ -20,7 +20,7 @@ libfindexec_la_CXXFLAGS   = -O3 -fomit-f
 libfindexec_g_la_CXXFLAGS = -g -Wextra -Wall -pedantic -Wno-long-long ${PIPE} ${CXXTEMPLFLAGS}
 # -fdiagnostics-show-option 
 
-AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} 
+AM_CPPFLAGS = -I${top_srcdir} -I${top_builddir} -DPKGLIBDIR=\"${libdir}/${PACKAGE_NAME}\"
 
 libfindexec_la_CPPFLAGS   = ${AM_CPPFLAGS} -DHAVE_CONFIG_H -DNDEBUG -DOM_NDEBUG
 libfindexec_g_la_CPPFLAGS = ${AM_CPPFLAGS} -DHAVE_CONFIG_H 
Index: Sources/findexec/feResource.cc
===================================================================
--- Sources.orig/findexec/feResource.cc
+++ Sources/findexec/feResource.cc
@@ -57,13 +57,7 @@ feResourceConfig_s feResourceConfigs[] =
 {
   {"SearchPath",    's', feResPath,  NULL,
    "$SINGULARPATH;"
-   "%b/LIB;"
-   "%r/LIB;"
-   "%d/LIB;"
-   "%b/MOD;"
-   "%b/../libexec/singular/MOD;"
-   "%r/MOD;"
-   "%d/MOD;"
+   "%L;%L/MOD;"
    "%b;"
    "%b/../share;"
    "%b/../share/singular/LIB;"
@@ -72,6 +66,7 @@ feResourceConfig_s feResourceConfigs[] =
    ""},
   {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/Singular",          (char *)""},
   {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/",                  (char *)""},
+  {"LibDir",    'L',    feResDir,   "SINGULAR_LIB_DIR",     PKGLIBDIR,              (char *)""},
   {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                (char *)""},
   {"DataDir",   'D',    feResDir,   "SINGULAR_DATA_DIR",    "%b/../share",          (char *)""},
   {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  (char *)""},
Index: Sources/libpolys/polys/Makefile.am
===================================================================
--- Sources.orig/libpolys/polys/Makefile.am
+++ Sources/libpolys/polys/Makefile.am
@@ -35,7 +35,7 @@ else
 endif
 
 libpolys_LTLIBRARIES = libpolys.la ${LIB_G}
-libpolysdir = $(libdir)/singular
+libpolysdir = ${libdir}/singular
 
 SOURCES = \
 	monomials/monomials.cc monomials/p_polys.cc monomials/ring.cc monomials/maps.cc \
@@ -120,8 +120,7 @@ p_Procs_FieldQ_g_la_SOURCES = ${P_PROCS}
 p_Procs_FieldZp_g_la_SOURCES = ${P_PROCS}
 
 
-moduledir = $(bindir)
-#moduledir = $(libexecdir)/singular/MOD/
+moduledir = ${libdir}/singular/MOD
 
 if ENABLE_P_PROCS_DYNAMIC
   module_LTLIBRARIES=p_Procs_FieldGeneral.la p_Procs_FieldIndep.la p_Procs_FieldQ.la p_Procs_FieldZp.la ${MOD_G}

Places

File singular-fhs.diff of Package singular (Revision 5ff6ae6e708004551252afabe7c7e320)

Places