some small fixes for prinary initialization - to do: create root makefile.am after configure.ac is setup

master
Marc Wäckerlin 9 years ago
parent aa0c9b5cfb
commit 7f16b0bcfa
  1. 6
      ax_init_standard_project.m4
  2. 16
      bootstrap.sh

@ -250,10 +250,10 @@ EOF
# use this in configure.ac to support HTML data for webservers # use this in configure.ac to support HTML data for webservers
AC_DEFUN([AX_BUILD_HTML], [ AC_DEFUN([AX_BUILD_HTML], [
AC_CONFIG_FILES([html/makefile]) AC_CONFIG_FILES([html/makefile])
AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-example-targets], [html/makefile.in]) AX_ADD_MAKEFILE_TARGET_DEP([maintainer-clean-am], [maintainer-clean-html-targets], [html/makefile.in])
test -f html/makefile.in && cat >> examples/html.in <<EOF test -f html/makefile.in && cat >> html/makefile.in <<EOF
#### Begin: Appended by $0 #### Begin: Appended by $0
maintainer-clean-example-targets: maintainer-clean-html-targets:
-rm makefile.in -rm makefile.in
#### End: $0 #### End: $0
EOF EOF

@ -40,7 +40,7 @@ SYNOPSIS
OPTIONS OPTIONS
--configure, -c call ./configure after initialization --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) --overwrite, -o overwrite all basic files (bootstrap.sh, m4-macros)
--rebuild, -r force rebuild of generated files, even if modified --rebuild, -r force rebuild of generated files, even if modified
--rebuild-file, -f <file> rebild specific file (can be added multiple times) --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 * ax_check_qt.m4 - auxiliary macro definition file
* mac-create-app-bundle.sh - script to create apple mac os-x app-bundle * mac-create-app-bundle.sh - script to create apple mac os-x app-bundle
* AUTHORS - replace your name in AUTHORS before first run * 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 * configure.ac - global configuration file template
* makefile.am - global makefile template * makefile.am - global makefile template
* src/makefile.am - if you enabled AX_USE_CXX * src/makefile.am - if you enabled AX_USE_CXX
@ -146,6 +148,7 @@ FILES TO EDIT
The following files normally require editing: The following files normally require editing:
* AUTHORS * AUTHORS
* NEWS
* README * README
* configure.ac * configure.ac
* src/makefile.am * src/makefile.am
@ -175,6 +178,7 @@ FILES
* AUTHORS: First line is the main author and used in Debian and RPM * AUTHORS: First line is the main author and used in Debian and RPM
packaging, so there must be a GPG key that matches packaging, so there must be a GPG key that matches
to this line. to this line.
* NEWS: File to add project news.
* README: First line is a short description of your project, then an * README: First line is a short description of your project, then an
empty line must follow. All remaining lines are a empty line must follow. All remaining lines are a
long description of your project. this information long description of your project. this information
@ -385,6 +389,14 @@ fi
to AUTHORS <<EOF && notice "please edit AUTHORS" to AUTHORS <<EOF && notice "please edit AUTHORS"
$AUTHOR $AUTHOR
EOF 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 && \ to configure.ac <<EOF && \
( notice "please edit configure.ac, then rerun $0"; exit 0 ) ( notice "please edit configure.ac, then rerun $0"; exit 0 )
${HEADER}m4_define(x_package_name, ${DEFAULT_PROJECT_NAME}) # project's name ${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 $(if testtag AX_USE_LIBTOOL; then
echo '/usr/%_lib/@PACKAGE_NAME@.so.*' echo '/usr/%_lib/@PACKAGE_NAME@.so.*'
else else
/usr/bin/ echo /usr/bin/
fi) fi)
%doc %doc
/usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS /usr/share/doc/packages/@PACKAGE_NAME@/AUTHORS

Loading…
Cancel
Save