1 files changed, 17 insertions, 35 deletions
diff --git a/Makefile b/Makefile
index 0807c55..8caf049 100644
--- a/Makefile
+++ b/Makefile
@@ -14,59 +14,41 @@ PKGNAME = bootcleanse
 COMMAND = bootcleanse
 LICENSES = $(PREFIX)$(DATA)
 
-BOOK=bootcleanse
-BOOKDIR=info/
+BOOK = bootcleanse
+BOOKDIR = info/
 
+MAKEINFO = makeinfo
+TEXI2DVI = texi2dvi
 
-all: info
 
+all: info
 
-info: $(BOOK).info.gz
+info: $(BOOK).info
 %.info: $(BOOKDIR)%.texinfo
 	$(MAKEINFO) "$<"
-%.info.gz: %.info
-	gzip -9c < "$<" > "$@"
-
 
 pdf: $(BOOK).pdf
 %.pdf: $(BOOKDIR)%.texinfo
 	texi2pdf "$<"
 
-pdf.gz: $(BOOK).pdf.gz
-%.pdf.gz: %.pdf
-	gzip -9c < "$<" > "$@"
-
-pdf.xz: $(BOOK).pdf.xz
-%.pdf.xz: %.pdf
-	xz -e9 < "$<" > "$@"
-
-
 dvi: $(BOOK).dvi
 %.dvi: $(BOOKDIR)%.texinfo
 	$(TEXI2DVI) "$<"
 
-dvi.gz: $(BOOK).dvi.gz
-%.dvi.gz: %.dvi
-	gzip -9c < "$<" > "$@"
-
-dvi.xz: $(BOOK).dvi.xz
-%.dvi.xz: %.dvi
-	xz -e9 < "$<" > "$@"
-
 
 install: install-cmd install-license install-info
 
 install-cmd:
-	install -dm755 "$(DESTDIR)$(PREFIX)$(BIN)"
-	install -m755 bootcleanse.py "$(DESTDIR)$(PREFIX)$(BIN)/$(COMMAND)"
+	mkdir -p -- "$(DESTDIR)$(PREFIX)$(BIN)"
+	cp -- bootcleanse.py "$(DESTDIR)$(PREFIX)$(BIN)/$(COMMAND)"
 
 install-license:
-	install -dm755 "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
-	install -m644 COPYING LICENSE "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
+	mkdir -p -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
+	cp -- COPYING LICENSE "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
 
-install-info: $(BOOK).info.gz
-	install -dm755 "$(DESTDIR)$(PREFIX)$(DATA)/info"
-	install -m644 "$(BOOK).info.gz" "$(DESTDIR)$(PREFIX)$(DATA)/info/$(PKGNAME).info.gz"
+install-info: $(BOOK).info
+	mkdir -p -- "$(DESTDIR)$(PREFIX)$(DATA)/info"
+	cp -- "$(BOOK).info" "$(DESTDIR)$(PREFIX)$(DATA)/info/$(PKGNAME).info"
 
 
 uninstall:
@@ -74,10 +56,10 @@ uninstall:
 	-rm -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/COPYING"
 	-rm -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)/LICENSE"
 	-rmdir -- "$(DESTDIR)$(LICENSES)/$(PKGNAME)"
-	-rm -- "$(DESTDIR)$(PREFIX)$(DATA)/info/$(PKGNAME).info.gz"
+	-rm -- "$(DESTDIR)$(PREFIX)$(DATA)/info/$(PKGNAME).info"
 
 clean:
-	-rm -r *.{t2d,aux,cp,cps,fn,ky,log,pg,pgs,toc,tp,vr,vrs,op,ops,bak,info,pdf,ps,dvi,gz} 2>/dev/null
-
-.PHONY: clean uninstall install
+	-rm -f -- *.t2d *.aux *.cp *.cps *.fn *.ky *.log *.pg *.pgs *.toc *.tp
+	-rm -f -- *.vr *.vrs *.op *.ops *.bak *.info *.pdf *.ps *.dvi *.gz
 
+.PHONY: all clean uninstall install