[Groonga-commit] groonga/groonga [master] [redhat] don't install RedHat platform related files by default.

Back to archive index

null+****@clear***** null+****@clear*****
2011年 11月 12日 (土) 17:10:19 JST


Kouhei Sutou	2011-11-12 08:10:19 +0000 (Sat, 12 Nov 2011)

  New Revision: 07e1cc8011f3a3c3ee005bdfea03563f525743ee

  Log:
    [redhat] don't install RedHat platform related files by default.
    
    Use --with-package-platform=redhat for installing them.

  Modified files:
    configure.ac
    data/init.d/redhat/Makefile.am
    data/init.d/redhat/sysconfig/Makefile.am

  Modified: configure.ac (+14 -0)
===================================================================
--- configure.ac    2011-11-12 07:56:03 +0000 (f16d85e)
+++ configure.ac    2011-11-12 08:10:19 +0000 (39c456a)
@@ -863,6 +863,19 @@ AC_MSG_RESULT($install_munin_plugins)
 AM_CONDITIONAL([INSTALL_MUNIN_PLUGINS],
                [test "${install_munin_plugins}" = "yes"])
 
+# platform
+AC_MSG_CHECKING([whether package platform])
+AC_ARG_WITH(package-platform,
+  [AS_HELP_STRING([--with-package-platform=PLATFORM],
+    [install package platform related files. [default=no]
+     (supported package platforms: redhat)])],
+  [package_platform="$withval"],
+  [package_platform="no"])
+AC_MSG_RESULT($package_platform)
+
+AM_CONDITIONAL([REDHAT_PLATFORM],
+               [test "${package_platform}" = "yes"])
+
 # plugins check
 relative_pluginsdir="\$(PACKAGE)/plugins"
 AC_SUBST(relative_pluginsdir)
@@ -949,6 +962,7 @@ echo "  CXXFLAGS:              ${CXXFLAGS}"
 echo "  Libraries:             ${LIBS}"
 echo "  Documentation:         ${document_available}"
 echo "  Munin plugins:         ${install_munin_plugins}"
+echo "  Package platform:      ${package_platform}"
 echo
 echo "Paths:"
 echo "  Install path prefix:   ${prefix}"

  Modified: data/init.d/redhat/Makefile.am (+7 -2)
===================================================================
--- data/init.d/redhat/Makefile.am    2011-11-12 07:56:03 +0000 (4a9c77f)
+++ data/init.d/redhat/Makefile.am    2011-11-12 08:10:19 +0000 (8015ada)
@@ -1,5 +1,10 @@
 SUBDIRS = sysconfig
 
+scripts = groonga
+
+if REDHAT_PLATFORM
 initdir = $(pkgsysconfdir)/init.d/redhat
-dist_init_SCRIPTS =	\
-	groonga
+dist_init_SCRIPTS = $(scripts)
+else
+EXTRA_DIST = $(scripts)
+endif

  Modified: data/init.d/redhat/sysconfig/Makefile.am (+7 -2)
===================================================================
--- data/init.d/redhat/sysconfig/Makefile.am    2011-11-12 07:56:03 +0000 (cf2e1cf)
+++ data/init.d/redhat/sysconfig/Makefile.am    2011-11-12 08:10:19 +0000 (00277ab)
@@ -1,3 +1,8 @@
+data = groonga
+
+if REDHAT_PLATFORM
 sysconfigdir = $(pkgsysconfdir)/init.d/redhat/sysconfig
-dist_sysconfig_DATA =	\
-	groonga
+dist_sysconfig_DATA = $(data)
+else
+EXTRA_DIST = $(data)
+endif




Groonga-commit メーリングリストの案内
Back to archive index