shipper-based packaging.

diff --git a/Makefile b/Makefile
index 629f72e917756c1dbe871125fb6a5a587f81e0e4..bd6050a103016b0edb771bf8155e85494f3ca4bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,3 +62,5 @@ dist: cupl-$(VERS).tar.gz
 clean:
        rm -f cupl *~ *.o toktab.h tokens.h grammar.c lexer.c lextest y.output cupl.tar cupl.tar.gz *.rpm cupl-*.tar.gz
 
+release: cupl-$(VERS).tar.gz cupl.html
+       shipper -f; rm -f CHANGES ANNOUNCE* *.1 *.html *.rpm *.lsm

diff --git a/cupl.spec b/cupl.spec
index 89d83a5b3ca70459603045eaa0596a3ca53d1e9d..1a44238a0b214c0a3999f3ad99407230903c292d 100644 (file)
--- a/cupl.spec
+++ b/cupl.spec
@@ -7,6 +7,7 @@ Source0: %{name}-%{version}.tar.gz
 License: GPL
 Group: Languages
 BuildRoot: %{_tmppath}/%{name}-root
+#Keywords: CUPL, CORC, language, interpreter, retrocomputing
 
 %description
 Interpreter for the archaic CUPL and CORC programming languages.
@@ -16,15 +17,14 @@ Includes full documentation and a chrestomathy of programs.
 %setup -q
 
 %build
-make
-make cupl.1
+make %{?_smp_mflags} cupl cupl.1
 
 %install
 [ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"
-mkdir -p "$RPM_BUILD_ROOT"/usr/bin
-mkdir -p "$RPM_BUILD_ROOT"/usr/share/man/man1/
-cp cupl "$RPM_BUILD_ROOT"/usr/bin
-cp cupl.1 "$RPM_BUILD_ROOT"/usr/share/man/man1/
+mkdir -p "$RPM_BUILD_ROOT"%{_bindir}
+mkdir -p "$RPM_BUILD_ROOT"%{_mandir}/man1/
+cp cupl "$RPM_BUILD_ROOT"%{_bindir}
+cp cupl.1 "$RPM_BUILD_ROOT"%{_mandir}/man1/
 
 %clean
 [ "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf "$RPM_BUILD_ROOT"