diff --git a/Makefile b/Makefile index d0d0e21..665880a 100644 --- a/Makefile +++ b/Makefile @@ -8,12 +8,12 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -DEPENDS = +DEPENDS = gcc,glibc ARCH = x86_64 URL = http://www.gnu.org/software/groff/ DESC = Groff (GNU troff) is a typesetting system that reads plain text mixed \ with formatting commands and produces formatted output. -SNAPVER = sr0 +SNAPVER = sr1 ARCHIVE := $(PWD)/SRC/$(shell ls SRC|egrep '(bz2|gz|tar|xz)$$'|tail -1) TYPE := $(shell file -ib $(ARCHIVE)|cut -d';' -f1|tr -d '\n') @@ -21,10 +21,6 @@ SRCDIR := $(shell tar -tf $(ARCHIVE)|head -1|sed 's/\/.*//') PATCHDIR := $(PWD)/SRC/patches VERSION := $(shell echo $(SRCDIR)|egrep -o '\-[0-9].*'|sed 's/^-//')$(SNAPVER) -MAKE = make -MAKEINST = make install -SNAPHACKS = - include /usr/share/snap/Makefile.snaplinux $(SRCDIR)/configure: $(ARCHIVE) @@ -43,9 +39,10 @@ $(SRCDIR)/configure: $(ARCHIVE) @touch $(SRCDIR)/configure $(SRCDIR)/config.log: $(SRCDIR)/configure - @if [ -f $(PATCHDIR)/*.patch ]; then \ - cd $(SRCDIR) && cat $(PATCHDIR)/*.patch|patch --verbose -Np1; \ - fi + @cd $(SRCDIR) && \ + for patch in `find $(PATCHDIR) -name \*.patch|sort`; do \ + patch --verbose -Np0 -i $$patch; \ + done @cd $(SRCDIR); \ PAGE=letter ./configure \ --prefix=/usr \ @@ -54,8 +51,7 @@ $(SRCDIR)/config.log: $(SRCDIR)/configure --target=x86_64-snap-linux-gnu $(SRCDIR)/src/roff/groff/groff: $(SRCDIR)/config.log - @cd $(SRCDIR); \ - $(MAKE) + @cd $(SRCDIR) && make $(ROOT): $(SRCDIR)/src/roff/groff/groff @if [ -d $(ROOT) ]; then \ @@ -64,10 +60,8 @@ $(ROOT): $(SRCDIR)/src/roff/groff/groff mkdir -v $(ROOT); \ fi - @cd $(SRCDIR); \ - $(MAKEINST) DESTDIR=$(ROOT) - - @$(SNAPHACKS) + @cd $(SRCDIR) && make install DESTDIR=$(ROOT) && \ + rm -v $(ROOT)/usr/share/info/dir test: $(ROOT) @cd $(SRCDIR); \