--- Src/Makefile.orig	Thu Apr 24 15:19:02 2003
+++ Src/Makefile	Thu Apr 24 15:19:53 2003
@@ -1,10 +1,10 @@
 CC     = gcc 
-INCLUDES = `gtk-config --cflags` -I. 
-LFLAGS = `gtk-config --libs`
-CFLAGS = -O2 -Wall 	 -pedantic $(INCLUDES) -DICON_TYPE=$(ICON_TYPE)
-INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include
+INCLUDES = `gtk12-config --cflags` -I. 
+LFLAGS = `gtk12-config --libs`
+CFLAGS =  $(INCLUDES) -DICON_TYPE=$(ICON_TYPE)
+INCDIR = -I${X11BASE}/include/X11 -I${X11BASE}/include
 DESTDIR= /usr/local
-LIBDIR = -L/usr/lib -L/usr/X11R6/lib
+LIBDIR = -L/usr/lib -L${X11BASE}/lib -L/usr/local/lib
 
 # for Linux
 LIBS   = -lXpm -lX11 -lXext -lical
@@ -17,7 +17,7 @@
 		calendarfunc.o
 
 .c.o:
-	$(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR)
+	$(CC) $(CFLAGS) -D`uname -s` -DHAVE_SYS_TIME_H -c $< -o $*.o $(INCDIR)
 
 
 all:	wmCalendar.o wmCalendar
