X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?p=selector.git;a=blobdiff_plain;f=Makefile;h=620085b9fcc32ee5f8d6075ad291a9a4e0564b27;hp=bc925d0292ffc0d6279ec42e816dd5e4d9065722;hb=HEAD;hpb=d16091a095fc688298550b1de41aad0b158b9761

diff --git a/Makefile b/Makefile
index bc925d0..620085b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 
 #
-#  selector is a simple shell command for selection of strings with a
-#  dynamic pattern-matching.
+#  selector is a simple command line utility for selection of strings
+#  with a dynamic pattern-matching.
 #
-#  Copyright (c) 2009 Francois Fleuret
-#  Written by Francois Fleuret <francois.fleuret@idiap.ch>
+#  Copyright (c) 2009-2012 Francois Fleuret
+#  Written by Francois Fleuret <francois@fleuret.org>
 #
 #  This file is part of selector.
 #
@@ -21,33 +21,36 @@
 #  along with selector.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-BINARY_PATH = /usr/local/bin
-MAN_PATH = /usr/share/man/man1
+BINARY_PATH = $(DESTDIR)/usr/local/bin
+MAN_PATH = $(DESTDIR)/usr/local/share/man/man1
 
 LDFLAGS=-lcurses
 
-REVISION_NUMBER=$(shell git log | grep ^commit | wc -l)
+UNAME=\"$(shell uname -srmn)\"
 
 ifeq ($(DEBUG),yes)
-  OPTIMIZE_FLAG = -ggdb3 -DDEBUG
+  OPTIMIZE_FLAG = -ggdb3 -DDEBUG -fno-omit-frame-pointer
 else
-  OPTIMIZE_FLAG = -ggdb3 -O3
+  OPTIMIZE_FLAG = -O2
 endif
 
-CXXFLAGS = -DREVISION_NUMBER=$(REVISION_NUMBER) -Wall $(OPTIMIZE_FLAG)
+CFLAGS = -Wall -Wextra -ansi -pedantic -DUNAME="$(UNAME)" $(OPTIMIZE_FLAG)
 
 all: selector
 
 selector: selector.o
-	$(CXX) $(CXXFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) -o $@ $^ $(LDFLAGS)
 
-install:
+install: selector
+	mkdir -p $(BINARY_PATH) $(MAN_PATH)
 	install -m 755 selector $(BINARY_PATH)
+	install -m 755 bash-selector.sh $(BINARY_PATH)
 	install -m 644 selector.1 $(MAN_PATH)
 	gzip $(MAN_PATH)/selector.1
 
 uninstall:
 	rm $(BINARY_PATH)/selector
+	rm $(BINARY_PATH)/bash-selector.sh
 	rm $(MAN_PATH)/selector.1.gz
 
 clean: