diff --git a/Makefile.am b/Makefile.am index ca152a38..e7515157 100644 --- a/Makefile.am +++ b/Makefile.am @@ -731,7 +731,7 @@ dist-hook: else \ echo A git clone is required to generate a ChangeLog >&2; \ fi - -cp $(top_srcdir)/builds/redhat/zeromq.spec $(distdir)/zeromq.spec + -cp $(top_srcdir)/packaging/redhat/zeromq.spec $(distdir)/zeromq.spec maintainer-clean-local: -rm -rf $(top_srcdir)/config diff --git a/builds/README b/builds/README new file mode 100644 index 00000000..1d2b8f34 --- /dev/null +++ b/builds/README @@ -0,0 +1,4 @@ +This directory holds build tools, i.e. tools we use to build the current +code tree. Packaging tools (which take released tarballs or github code +repos) should go into /packaging. + diff --git a/configure.ac b/configure.ac index ce3eae7b..7c8a9738 100644 --- a/configure.ac +++ b/configure.ac @@ -606,6 +606,6 @@ AC_CONFIG_FILES([ \ doc/Makefile \ builds/Makefile \ builds/msvc/Makefile \ - builds/redhat/zeromq.spec]) + packaging/redhat/zeromq.spec]) AC_OUTPUT diff --git a/packaging/README b/packaging/README new file mode 100644 index 00000000..c8350fe5 --- /dev/null +++ b/packaging/README @@ -0,0 +1,4 @@ +This directory is for packaging tools. Please do not hardcode version +numbers into your scripts; you can get them at runtime by calling +version.sh, or at configure time if you use autoconf. + diff --git a/builds/redhat/zeromq.spec.in b/packaging/redhat/zeromq.spec.in similarity index 100% rename from builds/redhat/zeromq.spec.in rename to packaging/redhat/zeromq.spec.in