From 42c0357631be0efcadd4d9f0ed7a6c20f115e56a Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 22 Aug 2006 09:53:19 +0000
Subject: move out of /usr/X11R6

---
 Makefile | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 8fe18c6..42f73d5 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,10 @@
 NAME= numlock
 VERSION = $(shell awk '/define version/ { print $$3 }' $(NAME).spec)
 
-LIB_NAME = lib
-ifneq (,$(shell uname -m | grep "\(x86_64\|sparc64\|ppc64\|s390x\)"))
-LIB_NAME = lib64
-endif
-
 TOP=
 CFLAGS=-g -O2 -Wall
 CC=gcc
-FLAGS=-lX11 -lXtst  -I/usr/X11R6/include -L/usr/X11R6/$(LIB_NAME)
+FLAGS=-lX11 -lXtst
 
 enable_X11_numlock: enable_X11_numlock.c
 	$(CC) $(CFLAGS) $(FLAGS) -o $@ $<
@@ -20,16 +15,16 @@ clean:
 	rm -f enable_X11_numlock core *.o
 
 install: all
-	install -d $(TOP)/usr/X11R6/{bin,man/man1}/
+	install -d $(TOP)/usr/{bin,share/man/man1}/
 	install -d $(TOP)/etc/profile.d
 	install -d $(TOP)/$(INITRDDIR)
 	install -d $(TOP)/etc/X11/xinit.d
 
-	install -m755 enable_X11_numlock $(TOP)/usr/X11R6/bin
-	install -m755 man/C/enable_X11_numlock.1 $(TOP)/usr/X11R6/man/man1/
+	install -m755 enable_X11_numlock $(TOP)/usr/bin
+	install -m755 man/C/enable_X11_numlock.1 $(TOP)/usr/share/man/man1/
 	for i in man/??* ; do \
-	    install -d $(TOP)/usr/X11R6/man/`basename $$i`/man1 ; \
-	    install -m 644 $$i/*.1 $(TOP)/usr/X11R6/man/`basename $$i`/man1 ; \
+	    install -d $(TOP)/usr/share/man/`basename $$i`/man1 ; \
+	    install -m 644 $$i/*.1 $(TOP)/usr/share/man/`basename $$i`/man1 ; \
 	done	
 
 	install -m755 numlock.init $(TOP)/$(INITRDDIR)/$(NAME)
-- 
cgit v1.2.1