Rebuild of the abcde Makefile

Thanks to Reuben Thomas and Steve McIntyre as well as ReaperX7,
bobzilla, 55020, GazL and dugan from the Slackware Forums.

This closes Issue 4:

 http://abcde.einval.com/bugzilla/show_bug.cgi?id=4

diff --git a/Makefile b/Makefile
index 21d1756..76fd569 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,24 +1,39 @@
+abcde_version = abcde-2.7.1

 INSTALL = /usr/bin/install -c
 
 INSTALL = /usr/bin/install -c
 

-# Installation directories
-prefix = ${DESTDIR}/usr
-exec_prefix = ${prefix}
-mandir = ${prefix}/share/man/man1
-bindir = ${exec_prefix}/bin
-etcdir = ${DESTDIR}/etc
+prefix = /usr/local
+exec_prefix = $(prefix)
+bindir = $(exec_prefix)/bin
+sysconfdir = $(prefix)/etc
+datarootdir = $(prefix)/share
+docdir = $(datarootdir)/doc/$(abcde_version)
+mandir = $(datarootdir)/man
+DESTDIR =

 
 all:
 
 clean:
 
 install:
 
 all:
 
 clean:
 
 install:

-       $(INSTALL) -d -m 755 $(bindir)
-       $(INSTALL) -m 755 abcde $(bindir)
-       $(INSTALL) -m 755 cddb-tool $(bindir)
-       $(INSTALL) -m 755 abcde-musicbrainz-tool $(bindir)
-       $(INSTALL) -d -m 755 $(mandir)
-       $(INSTALL) -m 644 abcde.1 $(mandir)
-       $(INSTALL) -m 644 cddb-tool.1 $(mandir)
-       $(INSTALL) -d -m 755 $(etcdir)
-       $(INSTALL) -m 644 abcde.conf $(etcdir)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+       $(INSTALL) -m 755 abcde cddb-tool abcde-musicbrainz-tool $(DESTDIR)$(bindir)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(sysconfdir)
+       $(INSTALL) -m 644 abcde.conf $(DESTDIR)$(sysconfdir)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(docdir)
+       $(INSTALL) -m 644 changelog COPYING FAQ README $(DESTDIR)$(docdir)
+       $(INSTALL) -d -m 755 $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -m 644 abcde.1 cddb-tool.1 $(DESTDIR)$(mandir)/man1

 
 

+uninstall:
+
+       -rm -v \
+       $(DESTDIR)$(bindir)/abcde \
+       $(DESTDIR)$(bindir)/cddb-tool \
+       $(DESTDIR)$(bindir)/abcde-musicbrainz-tool \
+       $(DESTDIR)$(sysconfdir)/abcde.conf \
+       $(DESTDIR)$(docdir)/changelog \
+       $(DESTDIR)$(docdir)/COPYING \
+       $(DESTDIR)$(docdir)/FAQ \
+       $(DESTDIR)$(docdir)/README \
+       $(DESTDIR)$(mandir)/man1/abcde.1 \
+       $(DESTDIR)$(mandir)/man1/cddb-tool.1

diff --git a/changelog b/changelog
index 3a5b988..4f3defc 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,5 +1,9 @@
 abcde 2.7.1
 
 abcde 2.7.1
 

+  * Rebuild of the abcde Makefile. Thanks to Reuben Thomas and Steve
+    McIntyre as well as ReaperX7, bobzilla, 55020, GazL and dugan from
+    the Slackware Forums. This closes Issue 4:
+    http://abcde.einval.com/bugzilla/show_bug.cgi?id=4 

   * Fix incorrect use of 'break'. Thanks to Reuben Thomas for the
     bug report and fix which closes Issue 6:
     http://abcde.einval.com/bugzilla/show_bug.cgi?id=6
   * Fix incorrect use of 'break'. Thanks to Reuben Thomas for the
     bug report and fix which closes Issue 6:
     http://abcde.einval.com/bugzilla/show_bug.cgi?id=6