summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefano Karapetsas <[email protected]>2014-01-01 19:32:23 +0100
committerStefano Karapetsas <[email protected]>2014-01-01 19:33:55 +0100
commit061874d02ec0a7e0e1e7ca44226f06568e3589b4 (patch)
tree57ea471d42839f21762fc1d59c0312a8ddf598de
parent3418016449e06e42f6d164a6fe9594fbe8adafe8 (diff)
downloadmate-netbook-061874d02ec0a7e0e1e7ca44226f06568e3589b4.tar.bz2
mate-netbook-061874d02ec0a7e0e1e7ca44226f06568e3589b4.tar.xz
Fixes for make dist and make distcheck
Conflicts: configure.ac
-rw-r--r--configure.ac2
-rw-r--r--mate-window-picker-applet/Makefile.am21
2 files changed, 14 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac
index fa42dc2..17890e8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ(2.53)
AC_INIT(mate-netbook, 1.6.0, [])
-AM_INIT_AUTOMAKE(tar-ustar no-dist-gzip dist-xz)
+AM_INIT_AUTOMAKE([1.9 foreign tar-ustar no-dist-gzip dist-xz])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_CONFIG_SRCDIR(maximus/main.c)
AC_CONFIG_MACRO_DIR([m4])
diff --git a/mate-window-picker-applet/Makefile.am b/mate-window-picker-applet/Makefile.am
index e577008..0ecd7b4 100644
--- a/mate-window-picker-applet/Makefile.am
+++ b/mate-window-picker-applet/Makefile.am
@@ -42,7 +42,7 @@ service_in_files = org.mate.panel.applet.MateWindowPickerFactory.service.in
service_DATA = $(service_in_files:.service.in=.service)
org.mate.panel.applet.MateWindowPickerFactory.service: $(service_in_files)
- $(AM_V_GEN)sed \
+ $(AM_V_GEN) $(SED) \
-e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
$< > $@
@@ -58,15 +58,20 @@ gsettings_SCHEMAS_in_in = $(gsettings_SCHEMAS:.xml=.xml.in.in)
xmluidir = $(datadir)/mate-panel/ui
xmlui_DATA = mate-window-picker-applet-menu.xml
-EXTRA_DIST = \
+EXTRA_DIST = \
org.mate.panel.MateWindowPicker.mate-panel-applet.in.in \
- $(service_in_files) \
- $(ui_DATA) \
- $(convert_DATA) \
- $(gsettings_SCHEMAS_in_in) \
+ $(service_in_files) \
+ $(ui_DATA) \
+ $(convert_DATA) \
+ $(gsettings_SCHEMAS_in_in) \
$(xmlui_DATA)
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS)
+CLEANFILES = \
+ $(applet_DATA) \
+ $(applet_DATA).in \
+ $(gsettings_SCHEMAS_in) \
+ $(gsettings_SCHEMAS) \
+ $(service_DATA)
clean:
- rm -f $(desktop_DATA) $(desktop_DATA).in $(server_DATA) $(server_DATA).in
+ rm -f $(desktop_DATA) $(desktop_DATA).in