diff options
| author | Stefano Karapetsas <[email protected]> | 2013-10-19 06:01:03 -0700 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2013-10-19 06:01:03 -0700 |
| commit | e12c6b7c696a13b60d90f57d98f35f7698cbf342 (patch) | |
| tree | e4349e0fcf0e19f8b48cc2f0fe9cfd208bfd0e05 | |
| parent | c867bb0be8cc40ece8be7cac0709461bec85068e (diff) | |
| parent | 1cbb900219bce4a804d4af9a929e706b687c03ef (diff) | |
| download | pluma-e12c6b7c696a13b60d90f57d98f35f7698cbf342.tar.bz2 pluma-e12c6b7c696a13b60d90f57d98f35f7698cbf342.tar.xz | |
Merge pull request #36 from infirit/master
Fixes for make dist
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/filebrowser/Makefile.am | 2 | ||||
| -rwxr-xr-x | plugins/time/Makefile.am | 2 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 |
6 files changed, 8 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am index d913c239..ac255ac9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -10,13 +10,11 @@ endif distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper EXTRA_DIST = \ - BUGS \ - ChangeLog-20011116 \ - ChangeLog-20051212 \ - ChangeLog-20090418 \ + ChangeLog \ HACKING \ - MAINTAINERS \ - pluma.doap \ + NEWS \ + NEWS.GNOME \ + README \ xmldocs.make \ omf.make \ intltool-extract.in \ @@ -58,8 +56,6 @@ MAINTAINERCLEANFILES = \ DISTCHECK_CONFIGURE_FLAGS = --disable-scrollkeeper --enable-gtk-doc -CHANGELOG_START = PLUMA_2_26_1 - dist-hook: @if test -d "$(srcdir)/.git"; \ then \ diff --git a/configure.ac b/configure.ac index 768f6e0d..de0808e5 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_SUBST(PLUMA_MINOR_VERSION, pluma_minor_version) AC_DEFINE(PLUMA_MICRO_VERSION, pluma_micro_version, [Pluma micro version]) AC_SUBST(PLUMA_MICRO_VERSION, pluma_micro_version) -AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip -Wno-portability]) +AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip -Wno-portability]) AM_MAINTAINER_MODE m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) diff --git a/data/Makefile.am b/data/Makefile.am index a7785dad..a2b6e9f3 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -27,7 +27,7 @@ bugreport_SCRIPTS = pluma-bugreport.sh EXTRA_DIST = \ $(desktop_in_files) \ - $(gsettings_SCHEMAS_in_in) \ + $(gsettings_SCHEMAS).in.in \ $(convert_DATA) \ $(man_MANS) \ pluma.pc.in \ diff --git a/plugins/filebrowser/Makefile.am b/plugins/filebrowser/Makefile.am index d6d5cfad..2124904c 100644 --- a/plugins/filebrowser/Makefile.am +++ b/plugins/filebrowser/Makefile.am @@ -76,7 +76,7 @@ gsettings_SCHEMAS = org.mate.pluma.plugins.filebrowser.gschema.xml EXTRA_DIST = \ $(ui_DATA) \ $(plugin_in_files) \ - $(gsettings_SCHEMAS_in_in) \ + $(gsettings_SCHEMAS).in.in \ pluma-file-browser-enum-types.h.template \ pluma-file-browser-enum-types.c.template \ pluma-file-browser-enum-register.c.template \ diff --git a/plugins/time/Makefile.am b/plugins/time/Makefile.am index 73942880..0c270b8a 100755 --- a/plugins/time/Makefile.am +++ b/plugins/time/Makefile.am @@ -34,7 +34,7 @@ gsettings_SCHEMAS = org.mate.pluma.plugins.time.gschema.xml %.gschema.xml.in: %.gschema.xml.in.in Makefile $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ -EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettings_SCHEMAS_in_in) +EXTRA_DIST = $(ui_DATA) $(plugin_in_files) $(gsettings_SCHEMAS).in.in CLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMASn) DISTCLEANFILES = $(plugin_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) diff --git a/po/POTFILES.in b/po/POTFILES.in index e12b3406..81143a82 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -47,7 +47,6 @@ pluma/pluma-window.c plugins/changecase/changecase.pluma-plugin.desktop.in plugins/changecase/pluma-changecase-plugin.c plugins/checkupdate/checkupdate.pluma-plugin.desktop.in -plugins/checkupdate/org.mate.pluma.plugins.checkupdate.gschema.xml.in.in plugins/checkupdate/pluma-check-update-plugin.c plugins/docinfo/docinfo.pluma-plugin.desktop.in [type: gettext/glade]plugins/docinfo/docinfo.ui |