diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-06-29 12:03:16 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-06-29 12:03:16 +0000 |
| commit | 67006cf83311fd70d4860d5ae9e277454eadf592 (patch) | |
| tree | 14f4d336cd39d0557a2b77f45c03f463ca36c907 | |
| parent | 64aa6445cd3eb9a0444f74f36ef647c4c8b49b80 (diff) | |
| parent | 5d05c0be5587abd3dadea2b2c823a2f250377a0d (diff) | |
| download | ayatana-indicator-datetime-67006cf83311fd70d4860d5ae9e277454eadf592.tar.gz ayatana-indicator-datetime-67006cf83311fd70d4860d5ae9e277454eadf592.tar.bz2 ayatana-indicator-datetime-67006cf83311fd70d4860d5ae9e277454eadf592.zip | |
remove --enable-localinstall from this indicator, too.
Approved by PS Jenkins bot, Lars Uebernickel.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 34 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
4 files changed, 2 insertions, 38 deletions
diff --git a/Makefile.am b/Makefile.am index c8b7f9a..133a0da 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,8 +8,6 @@ SUBDIRS += tests tests: src endif -DISTCHECK_CONFIGURE_FLAGS = --enable-localinstall - EXTRA_DIST = autogen.sh dist-hook: diff --git a/configure.ac b/configure.ac index 8933d17..5c131aa 100644 --- a/configure.ac +++ b/configure.ac @@ -110,40 +110,6 @@ AC_SUBST(COVERAGE_CFLAGS) AC_SUBST(COVERAGE_LDFLAGS) ########################### -# Check to see if we're local -########################### - -with_localinstall="no" -AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no) - -########################### -# Control Center Info -########################### - -AS_IF([test "x$have_ccpanel" = "xyes"], - [ - AS_IF([test "x$with_localinstall" = "xyes"], - [ - CCPANELDIR="${libdir}/control-center-1/panels/" - ], - [ - CCPANELDIR=`$PKG_CONFIG --variable=extensiondir libgnome-control-center` - ]) - - AC_SUBST(CCPANELDIR) - ]) -########################### -# DBus Service Info -########################### - -if test "x$with_localinstall" = "xyes"; then - DBUSSERVICEDIR="${datadir}/dbus-1/services/" -else - DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1` -fi -AC_SUBST(DBUSSERVICEDIR) - -########################### # Google Test framework ########################### diff --git a/data/Makefile.am b/data/Makefile.am index 1a33447..9bcac72 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -21,7 +21,7 @@ EXTRA_DIST += $(gsettings_SCHEMAS) # the dbus service file # -dbus_servicesdir = $(DBUSSERVICEDIR) +dbus_servicesdir = $(datadir)/dbus-1/services dbus_services_DATA = indicator-datetime.service dbus_services_in = $(dbus_services_DATA:.service=.service.in) $(dbus_services_DATA): $(dbus_services_in) diff --git a/src/Makefile.am b/src/Makefile.am index 7143c6b..2f247c1 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,6 +1,6 @@ if BUILD_CCPANEL -ccpaneldir = $(CCPANELDIR) +ccpaneldir = $(libdir)/control-center-1/panels/ ccpanel_LTLIBRARIES = libindicator-datetime.la endif |