mirror of
https://salsa.debian.org/freeipa-team/freeipa.git
synced 2026-07-29 15:55:47 -05:00
Build: properly integrate freeipa.spec.in into build system
AC_CONFIG_FILES in configure.ac works well only with Makefiles. Other files have to be handled by Makefile.am so depedencies are tracked properly. https://fedorahosted.org/freeipa/ticket/6498 Reviewed-By: Martin Basti <mbasti@redhat.com>
This commit is contained in:
committed by
Martin Basti
parent
ba6ae666ac
commit
6857de02f3
+9
-1
@@ -30,6 +30,7 @@ EXTRA_DIST = .mailmap \
|
|||||||
COPYING.openssl \
|
COPYING.openssl \
|
||||||
contrib \
|
contrib \
|
||||||
doc \
|
doc \
|
||||||
|
freeipa.spec.in \
|
||||||
pylintrc \
|
pylintrc \
|
||||||
pytest.ini
|
pytest.ini
|
||||||
|
|
||||||
@@ -45,6 +46,13 @@ clean-local:
|
|||||||
rpms _rpms-body srpms _srpms-body
|
rpms _rpms-body srpms _srpms-body
|
||||||
RPMBUILD ?= $(abs_builddir)/rpmbuild
|
RPMBUILD ?= $(abs_builddir)/rpmbuild
|
||||||
TARBALL = $(PACKAGE)-$(VERSION).tar.gz
|
TARBALL = $(PACKAGE)-$(VERSION).tar.gz
|
||||||
|
|
||||||
|
freeipa.spec: freeipa.spec.in $(top_builddir)/$(CONFIG_STATUS)
|
||||||
|
$(AM_V_GEN)sed \
|
||||||
|
-e 's|@VERSION[@]|$(VERSION)|g' \
|
||||||
|
-e 's|@VENDOR_SUFFIX[@]|$(VENDOR_SUFFIX)|g' \
|
||||||
|
$< > $@
|
||||||
|
|
||||||
rpmroot:
|
rpmroot:
|
||||||
mkdir -p $(RPMBUILD)/BUILD
|
mkdir -p $(RPMBUILD)/BUILD
|
||||||
mkdir -p $(RPMBUILD)/RPMS
|
mkdir -p $(RPMBUILD)/RPMS
|
||||||
@@ -85,7 +93,7 @@ dist-hook: $(VERSION_BAKEIN_TARGET)
|
|||||||
echo "$(TARBALL)" > $(top_builddir)/.tarball_name
|
echo "$(TARBALL)" > $(top_builddir)/.tarball_name
|
||||||
echo "$(VERSION)" > $(top_builddir)/.version
|
echo "$(VERSION)" > $(top_builddir)/.version
|
||||||
|
|
||||||
_rpms-prep: dist-gzip rpmroot rpmdistdir
|
_rpms-prep: dist-gzip rpmroot rpmdistdir freeipa.spec
|
||||||
cp $(top_builddir)/$$(cat $(top_builddir)/.tarball_name) $(RPMBUILD)/SOURCES/
|
cp $(top_builddir)/$$(cat $(top_builddir)/.tarball_name) $(RPMBUILD)/SOURCES/
|
||||||
rm -f $(top_builddir)/.tarball_name
|
rm -f $(top_builddir)/.tarball_name
|
||||||
|
|
||||||
|
|||||||
@@ -508,7 +508,6 @@ AC_CONFIG_FILES([
|
|||||||
daemons/ipa-slapi-plugins/ipa-sidgen/Makefile
|
daemons/ipa-slapi-plugins/ipa-sidgen/Makefile
|
||||||
daemons/ipa-slapi-plugins/ipa-range-check/Makefile
|
daemons/ipa-slapi-plugins/ipa-range-check/Makefile
|
||||||
daemons/ipa-slapi-plugins/topology/Makefile
|
daemons/ipa-slapi-plugins/topology/Makefile
|
||||||
freeipa.spec
|
|
||||||
init/systemd/Makefile
|
init/systemd/Makefile
|
||||||
init/tmpfilesd/Makefile
|
init/tmpfilesd/Makefile
|
||||||
init/Makefile
|
init/Makefile
|
||||||
|
|||||||
Reference in New Issue
Block a user