Permalink
Browse files

The example dir for `hier' file systems should be '$(prefix)/examples'.

  • Loading branch information...
Tetralet committed Jun 28, 2012
1 parent 2ba3d18 commit 1f54df5131a6be564d306d9fe88b676662c3c87f
Showing with 17 additions and 16 deletions.
  1. +1 −1 .default
  2. +5 −3 configure
  3. +11 −12 data/Makefile
View
@@ -22,6 +22,6 @@ BINDIR = $(PREFIX)/bin
DATADIR = $(PREFIX)/share
MANDIR = $(DATADIR)/man/man1
DOCDIR = $(DATADIR)/doc/$(BINARY)
+EXAMPLES_DIR = $(DATADIR)/doc/$(BINARY)/examples
LOCALEDIR = $(DATADIR)/locale
ICONDIR = $(DATADIR)/pixmaps
-
View
@@ -317,9 +317,6 @@ $ECHO ""
INFO "=================================================\n"
IMPORTANT " PREFIX = $PREFIX\n"
IMPORTANT " ETCDIR = $ETCDIR\n"
-if [ $BSD -eq 1 ]; then
- IMPORTANT " MANDIR = \$(PREFIX)/man/man1\n"
-fi
if [ "$DEBUG" = 'Y' ]; then
IMPORTANT " DEBUG = $DEBUG\n"
else
@@ -367,6 +364,10 @@ fi
fi
$ECHO " GTK = $GTK"
$ECHO " VTE = $VTE"
+if [ $BSD -eq 1 ]; then
+ IMPORTANT " MANDIR = \$(PREFIX)/man/man1\n"
+ IMPORTANT " EXAMPLES_DIR = \$(DATADIR)/examples/\$(BINARY)\n"
+fi
if [ "$GNOME_CONTROL_CENTER" = 'Y' ]; then
IMPORTANT " GNOME_CONTROL_CENTER = $GNOME_CONTROL_CENTER\n"
IMPORTANT " GNOME_CONTROL_CENTER_DIR = $GNOME_CONTROL_CENTER_DIR\n"
@@ -386,6 +387,7 @@ $ECHO "PREFIX = $PREFIX" >> .config
$ECHO "ETCDIR = $ETCDIR" >> .config
if [ $BSD -eq 1 ]; then
$ECHO "MANDIR = \$(PREFIX)/man/man1" >> .config
+ $ECHO "EXAMPLES_DIR = \$(DATADIR)/examples/\$(BINARY)" >> .config
fi
$ECHO "NLS = $NLS" >> .config
$ECHO "DEBUG = $DEBUG" >> .config
View
@@ -2,7 +2,6 @@ include ../.default
-include ../.config
DESKTOP_DIR ?= $(DATADIR)/applications
-EXAMPLES_DIR ?= $(DATADIR)/doc/$(BINARY)/examples
GNOME_CONTROL_CENTER ?= Y
GNOME_CONTROL_CENTER_DIR ?= $(DATADIR)/gnome-control-center/default-apps
@@ -12,18 +11,18 @@ ifeq ($(MAIN_BINARY), )
MAIN_BINARY = $(BINARY)
endif
-FileList = $(DESTDIR)/$(ETCDIR)/$(BINARY).conf \
- $(DESTDIR)/$(DOCDIR)/AUTHORS \
- $(DESTDIR)/$(DOCDIR)/COPYING \
- $(DESTDIR)/$(DOCDIR)/ChangeLog \
- $(DESTDIR)/$(MANDIR)/$(BINARY).1.gz \
- $(DESTDIR)/$(DESKTOP_DIR)/$(BINARY).desktop \
- $(DESTDIR)/$(ICONDIR)/$(BINARY).png \
- $(DESTDIR)/$(ICONDIR)/$(BINARY).xpm \
- $(DESTDIR)/$(EXAMPLES_DIR)/$(BINARY).conf
+RomveFileList = $(DESTDIR)/$(ETCDIR)/$(BINARY).conf \
+ $(DESTDIR)/$(DOCDIR)/AUTHORS \
+ $(DESTDIR)/$(DOCDIR)/COPYING \
+ $(DESTDIR)/$(DOCDIR)/ChangeLog \
+ $(DESTDIR)/$(MANDIR)/$(BINARY).1.gz \
+ $(DESTDIR)/$(DESKTOP_DIR)/$(BINARY).desktop \
+ $(DESTDIR)/$(ICONDIR)/$(BINARY).png \
+ $(DESTDIR)/$(ICONDIR)/$(BINARY).xpm \
+ $(DESTDIR)/$(EXAMPLES_DIR)/$(BINARY).conf
ifeq ($(GNOME_CONTROL_CENTER), Y)
ifneq ($(GNOME_CONTROL_CENTER_DIR), )
-FileList += $(DESTDIR)/$(GNOME_CONTROL_CENTER_DIR)/$(BINARY).xml
+RomveFileList += $(DESTDIR)/$(GNOME_CONTROL_CENTER_DIR)/$(BINARY).xml
endif
endif
@@ -93,7 +92,7 @@ endif
.PHONY: uninstall
uninstall:
- @ - for FileName in $(FileList) ; do \
+ @ - for FileName in $(RomveFileList) ; do \
if [ -f "$$FileName" ]; then \
$(PRINTF) "\033[1;35m** deleting $$FileName...\033[0m\n" ; \
rm -f "$$FileName" ; \

0 comments on commit 1f54df5

Please sign in to comment.