--- Makefile.orig Fri Mar 26 16:08:33 1999 +++ Makefile Wed May 5 12:23:28 1999 @@ -2,18 +2,19 @@ MKDIR=mkdir -p CFLAGS = -Wall -g +PREFIX?= /usr/local -GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \ +GNOME_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \ -DASCLOCK_GNOME `gnome-config --cflags gnomeui gnome gtk` GNOME_OBJS = .gnome/draw.o .gnome/asclock.o .gnome/config.o .gnome/rot.o .gnome/parser.o \ .gnome/symbols.o .gnome/dialogs.o .gnome/timezone.o .gnome/gnome_config.o GNOME_LIBS = -lpanel -lpanel_applet `gnome-config --libs gnomeui gnome gtk gnorba` -GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""/usr/local/share/asclock"\" \ - -DASCLOCK_GTK `$(CONFIG_PATH)gtk-config --cflags` +GTK_CC = gcc $(CFLAGS) -DASCLOCK_THEMES_DIR=\""${PREFIX}/share/asclock/themes/"\" \ + -DASCLOCK_GTK `$(CONFIG_PATH)gtk12-config --cflags` GTK_OBJS = .gtk/draw.o .gtk/asclock.o .gtk/config.o .gtk/rot.o .gtk/parser.o .gtk/symbols.o -GTK_LIBS = `$(CONFIG_PATH)gtk-config --libs` +GTK_LIBS = `$(CONFIG_PATH)gtk12-config --libs` info: default_theme @@ -41,24 +42,24 @@ $(GTK_CC) $(GTK_LIBS) $(GTK_OBJS) -o asclock install: asclock - $(CP) asclock /usr/X11/bin - $(MKDIR) /usr/local/share/asclock - $(MKDIR) /usr/local/share/asclock/themes - $(MKDIR) /usr/local/share/asclock/themes/Newstone - $(CP) themes/Newstone/* /usr/local/share/asclock/themes/Newstone - $(MKDIR) /usr/local/share/asclock/themes/Orb - $(CP) themes/Orb/* /usr/local/share/asclock/themes/Orb - $(MKDIR) /usr/local/share/asclock/themes/Stone - $(CP) themes/Stone/* /usr/local/share/asclock/themes/Stone - $(MKDIR) /usr/local/share/asclock/themes/analog - $(CP) themes/analog/* /usr/local/share/asclock/themes/analog - $(MKDIR) /usr/local/share/asclock/themes/beats - $(CP) themes/beats/* /usr/local/share/asclock/themes/beats - $(MKDIR) /usr/local/share/asclock/themes/classic - $(CP) themes/classic/* /usr/local/share/asclock/themes/classic - $(MKDIR) /usr/local/share/asclock/themes/shaped - $(CP) themes/shaped/* /usr/local/share/asclock/themes/shaped -# $(CP) -rf themes/* /usr/local/share/asclock/ + $(CP) asclock ${PREFIX}/bin + $(MKDIR) ${PREFIX}/share/asclock + $(MKDIR) ${PREFIX}/share/asclock/themes + $(MKDIR) ${PREFIX}/share/asclock/themes/Newstone + $(CP) themes/Newstone/* ${PREFIX}/share/asclock/themes/Newstone + $(MKDIR) ${PREFIX}/share/asclock/themes/Orb + $(CP) themes/Orb/* ${PREFIX}/share/asclock/themes/Orb + $(MKDIR) ${PREFIX}/share/asclock/themes/Stone + $(CP) themes/Stone/* ${PREFIX}/share/asclock/themes/Stone + $(MKDIR) ${PREFIX}/share/asclock/themes/analog + $(CP) themes/analog/* ${PREFIX}/share/asclock/themes/analog + $(MKDIR) ${PREFIX}/share/asclock/themes/beats + $(CP) themes/beats/* ${PREFIX}/share/asclock/themes/beats + $(MKDIR) ${PREFIX}/share/asclock/themes/classic + $(CP) themes/classic/* ${PREFIX}/share/asclock/themes/classic + $(MKDIR) ${PREFIX}/share/asclock/themes/shaped + $(CP) themes/shaped/* ${PREFIX}/share/asclock/themes/shaped +# $(CP) -rf themes/* ${PREFIX}/share/asclock/ clean: rm -rf core *.o *~ .gtk .gnome asclock asclock_applet