From f208f9c546548dd474de5ca879577461fa73ac6a Mon Sep 17 00:00:00 2001 From: Sam Hewitt Date: Tue, 8 Dec 2015 18:36:53 -0500 Subject: [PATCH] updated autotools stuff --- .gitignore | 9 +++++++++ README.md | 2 +- autogen.sh | 12 +++++++++--- configure.ac | 6 +++--- paper-icon-theme.spec | 2 +- 5 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..f9ed17f1 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +Makefile.in +aclocal.m4 +autom4te.cache/ +configure +install-sh +missing +Makefile +config.log +config.status \ No newline at end of file diff --git a/README.md b/README.md index 708cb8f3..0bb6b11f 100755 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ You can build and install the Paper icon themes from source: make sudo make install -This procedure requires ```gnome-common``` on your system. +This procedure requires ```autotools``` on your system. ###Installing Paper diff --git a/autogen.sh b/autogen.sh index 08a0d62d..55598058 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,5 +1,11 @@ #!/bin/sh -# Run this to generate all the initial makefiles, etc. -autoreconf -vfi -./configure --prefix=/usr $* \ No newline at end of file +set -e + +autoreconf --force --install --symlink --warnings=all + +if test -z "${NOCONFIGURE}"; then + set -x + ./configure --prefix=/usr "$@" + make clean +fi \ No newline at end of file diff --git a/configure.ac b/configure.ac index 9d5f6d8b..ba54f61a 100755 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([Paper ], 1.0, [sam@snwh.org], [Paper], [http://snwh.org/paper]) +AC_INIT([Paper ], 1.1, [https://github.com/snwh/paper-icon-theme/issues], [paper-icon-theme], [http://snwh.org/paper]) AM_INIT_AUTOMAKE([-Wno-portability no-dist-gzip dist-xz foreign subdir-objects 1.9 tar-ustar]) AC_PREFIX_DEFAULT(/usr/local) AM_SILENT_RULES([yes]) @@ -8,11 +8,11 @@ AC_CONFIG_FILES([Makefile]) AC_OUTPUT AC_MSG_RESULT([ - Paper icon theme $VERSION + Paper Icon Theme $VERSION ======== prefix: ${prefix} exec_prefix: ${exec_prefix} datarootdir: ${datarootdir} -]) +]) \ No newline at end of file diff --git a/paper-icon-theme.spec b/paper-icon-theme.spec index bba570ee..c233c369 100755 --- a/paper-icon-theme.spec +++ b/paper-icon-theme.spec @@ -17,7 +17,7 @@ %global commit0 40-CHARACTER-HASH-VALUE name: paper-icon-theme -version: 1.0 +version: 1.1 release: 1 Summary: Paper Icon theme