From 7f16b0bcfa9bf8e940d6af096b7be0bf3b191b41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc=20W=C3=A4ckerlin?= <marc@mrw.sh>
Date: Wed, 19 Aug 2015 22:44:19 +0000
Subject: [PATCH] some small fixes for prinary initialization - to do: create
 root makefile.am after configure.ac is setup

---
 ax_init_standard_project.m4 |  6 +++---
 bootstrap.sh                | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ax_init_standard_project.m4 b/ax_init_standard_project.m4
index 2b8eaa6..6b667fc 100644
--- a/ax_init_standard_project.m4
+++ b/ax_init_standard_project.m4
@@ -250,10 +250,10 @@ EOF
 # use this in configure.ac to support HTML data for webservers
 AC_DEFUN([AX_BUILD_HTML], [
   AC_CONFIG_FILES([html/makefile])
-  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-example-targets], [html/makefile.in])
-  test -f html/makefile.in && cat >> examples/html.in <<EOF
+  AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-html-targets], [html/makefile.in])
+  test -f html/makefile.in && cat >> html/makefile.in <<EOF
 #### Begin: Appended by $0
-maintainer-clean-example-targets:
+maintainer-clean-html-targets:
 	-rm makefile.in
 #### End: $0
 EOF
diff --git a/bootstrap.sh b/bootstrap.sh
index 000ab21..db9b50a 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -40,7 +40,7 @@ SYNOPSIS
 OPTIONS
 
   --configure, -c            call ./configure after initialization
-  --build, -c                build, also call ./configure && make
+  --build, -b                build, also call ./configure && make
   --overwrite, -o            overwrite all basic files (bootstrap.sh, m4-macros)
   --rebuild, -r              force rebuild of generated files, even if modified
   --rebuild-file, -f <file>  rebild specific file (can be added multiple times)
@@ -102,6 +102,8 @@ GENERATED FILES
     * ax_check_qt.m4 - auxiliary macro definition file
     * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
     * AUTHORS - replace your name in AUTHORS before first run
+    * NEWS - empty file add your project's news
+    * README - add project description (first line is header, followed by an empty line)
     * configure.ac - global configuration file template
     * makefile.am - global makefile template
     * src/makefile.am - if you enabled AX_USE_CXX
@@ -146,6 +148,7 @@ FILES TO EDIT
 
   The following files normally require editing:
     * AUTHORS
+    * NEWS
     * README
     * configure.ac
     * src/makefile.am
@@ -175,6 +178,7 @@ FILES
   * AUTHORS:      First line is the main author and used in Debian and RPM
                   packaging, so there must be a GPG key that matches
                   to this line.
+  * NEWS:         File to add project news.
   * README:       First line is a short description of your project, then an
                   empty line must follow. All remaining lines are a
                   long description of your project. this information
@@ -385,6 +389,14 @@ fi
 to AUTHORS <<EOF && notice "please edit AUTHORS"
 $AUTHOR
 EOF
+to NEWS <<EOF && notice "please edit NEWS"
+$(date) created ${DEFAULT_PROJECT_NAME}
+EOF
+to README <<EOF && notice "please edit README"
+${DEFAULT_PROJECT_NAME}
+
+add description for ${DEFAULT_PROJECT_NAME}
+EOF
 to configure.ac <<EOF && \
     ( notice "please edit configure.ac, then rerun $0"; exit 0 )
 ${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name
@@ -788,7 +800,7 @@ rm -rf \$RPM_BUILD_ROOT
 $(if testtag AX_USE_LIBTOOL; then
 echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
 else
-/usr/bin/
+echo /usr/bin/
 fi)
 %doc
 /usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS