1 files changed, 26 insertions, 22 deletions

diff --git a/Makefile.in b/Makefile.in
index f788435c0..4d9983672 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,20 +1,4 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-bindir=@bindir@
-libdir=@libdir@
-datarootdir=@datarootdir@
-mandir=@mandir@
-sysconfdir=@sysconfdir@
-
-VERSION=@PACKAGE_VERSION@
-NAME=@PACKAGE_NAME@
-PACKAGE_TARNAME=@PACKAGE_TARNAME@
-DOCDIR=@docdir@
-HAVE_APPARMOR=@HAVE_APPARMOR@
-HAVE_CONTRIB_INSTALL=@HAVE_CONTRIB_INSTALL@
-BUSYBOX_WORKAROUND=@BUSYBOX_WORKAROUND@
-HAVE_SUID=@HAVE_SUID@
-HAVE_MAN=@HAVE_MAN@
+include config.mk
 
 ifneq ($(HAVE_MAN),no)
 MAN_TARGET = man
@@ -101,7 +85,7 @@ distclean: clean
                 $(MAKE) -C $$dir distclean; \
         done
         $(MAKE) -C test distclean
-        rm -fr Makefile autom4te.cache config.log config.status config.h src/common.mk mkdeb.sh
+        rm -fr Makefile autom4te.cache config.log config.mk config.sh config.status src/common.mk mkdeb.sh
 
 realinstall:
         # firejail executable
@@ -203,19 +187,39 @@ uninstall:
         rm -f $(DESTDIR)$(datarootdir)/bash-completion/completions/firecfg
         @echo "If you want to install a different version of firejail, you might also need to run 'rm -fr $(DESTDIR)$(sysconfdir)/firejail', see #2038."
 
-DISTFILES = "src etc m4 platform contrib configure configure.ac Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh.in COPYING README RELNOTES"
-DISTFILES_TEST = "test/Makefile.in test/apps test/apps-x11 test/apps-x11-xorg test/root test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils test/chroot"
+DISTFILES = \
+COPYING \
+Makefile.in \
+README \
+RELNOTES \
+config.mk.in \
+config.sh.in \
+configure \
+configure.ac \
+contrib \
+etc \
+install.sh \
+m4 \
+mkdeb.sh.in \
+mketc.sh \
+mkman.sh \
+platform \
+src
+
+DISTFILES_TEST = test/Makefile.in test/apps test/apps-x11 test/apps-x11-xorg test/root test/private-lib test/fnetfilter test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/fs test/sysutils test/chroot
 
 dist:
+        mv config.sh config.sh.old
         mv config.status config.status.old
         mv mkdeb.sh mkdeb.sh.old
         make distclean
         mv mkdeb.sh.old mkdeb.sh
         mv config.status.old config.status
+        mv config.sh.old config.sh
         rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz
         mkdir -p $(NAME)-$(VERSION)/test
-        cp -a "$(DISTFILES)" $(NAME)-$(VERSION)
-        cp -a "$(DISTFILES_TEST)" $(NAME)-$(VERSION)/test
+        cp -a $(DISTFILES) $(NAME)-$(VERSION)
+        cp -a $(DISTFILES_TEST) $(NAME)-$(VERSION)/test
         rm -rf $(NAME)-$(VERSION)/src/tools
         find $(NAME)-$(VERSION) -name .svn -delete
         tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION)