From 74067d389c204cd40906980391680724380667c0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 15 Feb 2017 18:55:25 -0500 Subject: Expect devtools files to already be patched. --- src/chroot-tools/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/chroot-tools/Makefile') diff --git a/src/chroot-tools/Makefile b/src/chroot-tools/Makefile index 93655d7..055b40e 100644 --- a/src/chroot-tools/Makefile +++ b/src/chroot-tools/Makefile @@ -3,14 +3,14 @@ include $(topsrcdir)/build-aux/Makefile.head.mk pkglibexecdir = $(libexecdir)/libretools/chroot -libretools.src.devtools = makechrootpkg.sh.in mkarchroot.in arch-nspawn.in +libretools.src.devtools = makechrootpkg.in mkarchroot.in arch-nspawn.in libretools.out.bins = chcleanup librechroot libremakepkg libretools.out.libexecs = arch-nspawn chcleanup distcc-tool indent mkarchroot libretools.out.libs = $(libretools.src.sh) makechrootpkg.sh files.out.int += chcleanup.lib -$(srcdir)/makechrootpkg.sh.in: $(srcdir)/%.sh.in: $(devtoolsdir)/%.in - cp $< $@ +$(srcdir)/makechrootpkg.sh.in: $(srcdir)/makechrootpkg.in + sed '/^\s*main "$$@"\s*$$/d' < $< > $@ $(outdir)/chcleanup: $(srcdir)/chcleanup.in $(outdir)/chcleanup.lib m4 -I$(@D) -P $< | $(libretools.edit) | install -m755 /dev/stdin $@ -- cgit v1.2.2