[PATCH] Configuration fixups for packaging purposes & FHS
- From: Darren Salt <linux@xxxxxxxxxxxxxxxxxxxxxxxxxxx>
- To: yadex@xxxxxxxxxxxxx
- Date: Mon, 19 Jun 2006 01:46:19 +0100
$(DESTDIR) is normally used for fixing up the install paths for packaging
purposes. The first patch makes the necessary changes.
The second patch adds some FHS path usage, taking note of and applying the
"FHS-ly correct" comments and also making sure that the man page, if the
prefix is /usr/local, goes in /usr/local/share/man rather than
/usr/local/man. (Recent autoconf will do the same.)
--
| Darren Salt | linux or ds at | nr. Ashington, | Toon
| RISC OS, Linux | youmustbejoking,demon,co,uk | Northumberland | Army
| + Buy less and make it last longer. INDUSTRY CAUSES GLOBAL WARMING.
A foolish consistency is the hobgoblin of little minds.
diff -urNad yadex-1.7.900~/GNUmakefile yadex-1.7.900/GNUmakefile
--- yadex-1.7.900~/GNUmakefile 2006-06-18 21:05:40.000000000 +0100
+++ yadex-1.7.900/GNUmakefile 2006-06-18 21:05:41.363241000 +0100
@@ -394,19 +394,19 @@
.PHONY: install
install: $(OBJDIR)/install
- @scripts/mkinstalldirs $(BINDIR)
- @scripts/mkinstalldirs $(ETCDIR)
- @scripts/mkinstalldirs $(MANDIR)
- @scripts/mkinstalldirs $(MANDIR)/man6
- @scripts/mkinstalldirs $(SHAREDIR)
- $(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex-$(VERSION)
- rm -f $(BINDIR)/yadex
- ln -s yadex-$(VERSION) $(BINDIR)/yadex
- $(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex-$(VERSION).6
- rm -f $(MANDIR)/man6/yadex.6
- ln -s yadex-$(VERSION).6 $(MANDIR)/man6/yadex.6
- $(OBJDIR)/install -m 644 -d $(SHAREDIR) $(YGD)
- $(OBJDIR)/install -m 644 -d $(ETCDIR) yadex.cfg
+ @scripts/mkinstalldirs $(DESTDIR)$(BINDIR)
+ @scripts/mkinstalldirs $(DESTDIR)$(ETCDIR)
+ @scripts/mkinstalldirs $(DESTDIR)$(MANDIR)
+ @scripts/mkinstalldirs $(DESTDIR)$(MANDIR)/man6
+ @scripts/mkinstalldirs $(DESTDIR)$(SHAREDIR)
+ $(OBJDIR)/install -m 755 $(OBJDIR)/yadex
$(DESTDIR)$(BINDIR)/yadex-$(VERSION)
+ rm -f $(DESTDIR)$(BINDIR)/yadex
+ ln -s yadex-$(VERSION) $(DESTDIR)$(BINDIR)/yadex
+ $(OBJDIR)/install -m 644 doc/yadex.6
$(DESTDIR)$(MANDIR)/man6/yadex-$(VERSION).6
+ rm -f $(DESTDIR)$(MANDIR)/man6/yadex.6
+ ln -s yadex-$(VERSION).6 $(DESTDIR)$(MANDIR)/man6/yadex.6
+ $(OBJDIR)/install -m 644 -d $(DESTDIR)$(SHAREDIR) $(YGD)
+ $(OBJDIR)/install -m 644 -d $(DESTDIR)$(ETCDIR) yadex.cfg
@echo "---------------------------------------------------------------"
@echo " Yadex is now installed."
@echo
diff -urNad yadex-1.7.900~/configure yadex-1.7.900/configure
--- yadex-1.7.900~/configure 2006-06-18 21:05:40.000000000 +0100
+++ yadex-1.7.900/configure 2006-06-18 21:07:40.210668500 +0100
@@ -775,7 +775,7 @@
#
if expr "$PREFIX" : '//*usr/*$' >/dev/null
then
- BINDIR=/usr/bin # FHS-ly correct is /usr/games
+ BINDIR=/usr/games
ETCDIR=/etc/$APPNAME/%v
ETCDIRNV=/etc/$APPNAME
MANDIR=/usr/share/man
@@ -783,10 +783,10 @@
SHAREDIRNV=/usr/share/games/$APPNAME
elif expr "$PREFIX" : '//*usr//*local/*$' >/dev/null
then
- BINDIR=/usr/local/bin # FHS-ly correct is /usr/local/games
+ BINDIR=/usr/local/games
ETCDIR=/etc/$APPNAME/%v
ETCDIRNV=/etc/$APPNAME
- MANDIR=/usr/local/man
+ MANDIR=/usr/local/share/man
SHAREDIR=/usr/local/share/games/$APPNAME/%v
SHAREDIRNV=/usr/local/share/games/$APPNAME
elif expr "$PREFIX" : '//*opt/*$' >/dev/null
Other related posts:
- » [PATCH] Configuration fixups for packaging purposes & FHS
