diff -Naur gkrellAclock-0.3.2/Makefile gkrellAclock-0.3.2.new/Makefile --- gkrellAclock-0.3.2/Makefile 2003-03-30 19:20:16 +0300 +++ gkrellAclock-0.3.2.new/Makefile 2003-03-30 19:22:38 +0300 @@ -1,5 +1,10 @@ -GTK_INCLUDE = `pkg-config gtk+-2.0 --cflags` -GTK_LIB = `pkg-config gtk+-2.0 --libs` +GTK_CONFIG ?=pkg-config gtk+-2.0 +PLUGIN_DIR ?=/usr/local/lib/gkrellm2/plugins + +GTK_INCLUDE = `$(GTK_CONFIG) --cflags` +GTK_LIB = `$(GTK_CONFIG) --libs` + +INSTALL=install -c -m 755 FLAGS = -O2 -Wall -fPIC $(GTK_INCLUDE) LIBS = $(GTK_LIB) @@ -29,15 +34,10 @@ gkrellaclock.o: gkrellaclock.c -install: +install: gkrellaclock.so (cd po && ${MAKE} install ) - if [ -d /usr/local/lib/gkrellm2/plugins/ ] ; then \ - install -c -s -m 644 gkrellaclock.so /usr/local/lib/gkrellm2/plugins/ ; \ - elif [ -d /usr/lib/gkrellm2/plugins/ ] ; then \ - install -c -s -m 644 gkrellaclock.so /usr/lib/gkrellm2/plugins/ ; \ - else \ - install -D -c -s -m 644 gkrellaclock.so /usr/lib/gkrellm2/plugins/gkrellaclock.so ; \ - fi + $(INSTALL) -d $(PLUGIN_DIR) + $(INSTALL) gkrellaclock.so $(PLUGIN_DIR) userinstall: if [ -d $(HOME)/.gkrellm2/plugins/ ] ; then \ install -C -s -m 644 gkrellaclock.so $(HOME)/.gkrellm2/plugins/ ; \