--- Makefile.orig Thu Jul 5 14:33:45 2001 +++ Makefile Thu Aug 9 15:36:12 2001 @@ -1,14 +1,10 @@ -GTK_CONFIG ?= gtk-config -IMLIB_CONFIG ?= imlib-config - GTK_INCLUDE = `$(GTK_CONFIG) --cflags` GTK_LIB = `$(GTK_CONFIG) --libs` IMLIB_INCLUDE = `$(IMLIB_CONFIG) --cflags-gdk` IMLIB_LIB = `$(IMLIB_CONFIG) --libs-gdk` -PTHREAD_LIBS ?= -lpthread -FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(PTHREAD_CLFAGS) +FLAGS = -Wall -fPIC $(GTK_INCLUDE) $(IMLIB_INCLUDE) $(PTHREAD_CFLAGS) LIBS = $(GTK_LIB) $(IMLIB_LIB) $(PTHREAD_LIBS) LFLAGS = -shared @@ -16,11 +12,10 @@ INSTALLFLAGS = -c -s -m 644 PLUGINDIR ?= usr/share/gkrellm/plugins DESTDIR ?= $(PREFIX) -INSTALLDIR = $(DESTDIR)/$(PLUGINDIR) +INSTALLDIR = $(PREFIX)/libexec/gkrellm/plugins VERSION=0.4 -CC ?= gcc CFLAGS += $(FLAGS) -DVERSION=\"$(VERSION)\" TARBALL=gkrellm_qst-$(VERSION).tar @@ -41,9 +36,7 @@ $(INSTALL) qst.so $(HOME)/.gkrellm/plugins install: qst.so - @[ "`whoami`" != "root" ] && echo "Not root. Try make install_home" && exit 1 - $(INSTALL) -d $(INSTALLDIR) - $(INSTALL) qst.so $(INSTALLDIR) + @$(BSD_INSTALL_DATA) qst.so $(INSTALLDIR) tarball: (cd ..; tar cf $(TARBALL) gkrellm_qst ; gzip $(TARBALL) )