diff options
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.ac | 9 | ||||
| -rw-r--r-- | packaging/Makefile.am | 5 | ||||
| -rw-r--r-- | packaging/fedora/Makefile.am | 9 |
4 files changed, 24 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index d61d893..2dcf101 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,3 @@ -# Packaging files -PACKAGING_FILES = \ - packaging/fedora/tinyproxy.init \ - packaging/fedora/tinyproxy.spec # The following files are required for the build process CONFIG_FILES = \ @@ -9,8 +5,8 @@ CONFIG_FILES = \ config/ltmain.sh config/install-sh config/missing config/mkinstalldirs \ config/typecheck.m4 config/argenable.m4 -EXTRA_DIST = $(CONFIG_FILES) TODO $(PACKAGING_FILES) bootstrap -SUBDIRS = src doc +EXTRA_DIST = $(CONFIG_FILES) TODO autogen.sh +SUBDIRS = src doc packaging install-data-local: tinyproxy-configure-file tinyproxy-html-files diff --git a/configure.ac b/configure.ac index 5966c86..37a3261 100644 --- a/configure.ac +++ b/configure.ac @@ -337,5 +337,12 @@ AC_SUBST(ADDITIONAL_OBJECTS) AC_SUBST(TINYPROXY_CONFIG_DIR) AC_SUBST(TINYPROXY_CONFIG_FILE) -AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile]) +AC_CONFIG_FILES([ +Makefile +src/Makefile +doc/Makefile +packaging/Makefile +packaging/fedora/Makefile +]) + AC_OUTPUT diff --git a/packaging/Makefile.am b/packaging/Makefile.am new file mode 100644 index 0000000..6fc8a1c --- /dev/null +++ b/packaging/Makefile.am @@ -0,0 +1,5 @@ + +# The various packaging directories + +SUBDIRS = fedora + diff --git a/packaging/fedora/Makefile.am b/packaging/fedora/Makefile.am new file mode 100644 index 0000000..f3b4a7b --- /dev/null +++ b/packaging/fedora/Makefile.am @@ -0,0 +1,9 @@ + +# Packaging files + +PACKAGING_FILES = \ + tinyproxy.init \ + tinyproxy.spec + +EXTRA_DIST = $(PACKAGING_FILES) + |