1997-09-19 03:47:36 +00:00
|
|
|
*** Imakefile.orig Thu Aug 28 20:36:09 1997
|
|
|
|
--- Imakefile Fri Sep 19 03:29:21 1997
|
1997-08-28 04:38:45 +00:00
|
|
|
***************
|
1997-09-19 03:47:36 +00:00
|
|
|
*** 6,27 ****
|
1997-08-28 04:38:45 +00:00
|
|
|
/* ---------------------------------------------------------------- */
|
|
|
|
|
|
|
|
LIBNAME=Im
|
|
|
|
! LIBREV=1.0
|
|
|
|
|
1997-09-14 19:36:43 +00:00
|
|
|
! CONVERT_DIR=/usr/bin
|
|
|
|
! NETPBM_DIR=/usr/bin
|
1997-08-28 04:38:45 +00:00
|
|
|
|
1997-06-03 23:39:10 +00:00
|
|
|
#ifdef UseEtcX11
|
|
|
|
ETCDIR=/etc/X11/$(LIBNAME)
|
|
|
|
#else
|
|
|
|
! ETCDIR=/etc
|
|
|
|
#endif /* def UseEtcX11 */
|
|
|
|
|
|
|
|
CNFDIR = $(ETCDIR)
|
1997-09-19 03:47:36 +00:00
|
|
|
|
|
|
|
DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
|
|
|
|
-DCONVERT_PATH=\"$(CONVERT_DIR)\" \
|
|
|
|
! -DNETPBM_PATH=\"$(NETPBM_DIR)\"
|
|
|
|
|
|
|
|
SRCS = load.c rend.c misc.c colors.c cache.c
|
|
|
|
OBJS = load.o rend.o misc.o colors.o cache.o
|
|
|
|
--- 6,29 ----
|
1997-09-14 19:36:43 +00:00
|
|
|
/* ---------------------------------------------------------------- */
|
|
|
|
|
|
|
|
LIBNAME=Im
|
|
|
|
! LIBREV=3.0
|
|
|
|
|
|
|
|
! CONVERT_DIR=/usr/X11R6/bin
|
|
|
|
! NETPBM_DIR=/usr/X11R6/bin
|
1997-09-19 03:47:36 +00:00
|
|
|
! JPEG_DIR=/usr/local/bin
|
1997-09-14 19:36:43 +00:00
|
|
|
|
1997-06-03 23:39:10 +00:00
|
|
|
#ifdef UseEtcX11
|
|
|
|
ETCDIR=/etc/X11/$(LIBNAME)
|
|
|
|
#else
|
1997-08-28 04:38:45 +00:00
|
|
|
! ETCDIR=/usr/X11R6/lib/X11/enlightenment
|
1997-06-03 23:39:10 +00:00
|
|
|
#endif /* def UseEtcX11 */
|
|
|
|
|
|
|
|
CNFDIR = $(ETCDIR)
|
1997-09-19 03:47:36 +00:00
|
|
|
|
|
|
|
DEFINES = -DSYSTEM_IMRC=\"$(ETCDIR)/imrc\" \
|
|
|
|
-DCONVERT_PATH=\"$(CONVERT_DIR)\" \
|
|
|
|
! -DNETPBM_PATH=\"$(NETPBM_DIR)\" \
|
|
|
|
! -DJPEG_PATH=\"$(JPEG_DIR)\"
|
|
|
|
|
|
|
|
SRCS = load.c rend.c misc.c colors.c cache.c
|
|
|
|
OBJS = load.o rend.o misc.o colors.o cache.o
|
|
|
|
*************** InstallMultiple($(HDRS),$(INCROOT)/X11)
|
1997-08-28 04:38:45 +00:00
|
|
|
*** 64,70 ****
|
1997-06-03 23:39:10 +00:00
|
|
|
CNFSRC = ./sys_conf
|
|
|
|
CNFS = $(CNFSRC)/imrc
|
|
|
|
PALS = $(CNFSRC)/im_palette.pal
|
|
|
|
! CNFFLAGS = -m 0644 -o root -g root
|
|
|
|
InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS))
|
|
|
|
|
|
|
|
DependTarget()
|
1997-09-19 03:47:36 +00:00
|
|
|
--- 66,72 ----
|
1997-06-03 23:39:10 +00:00
|
|
|
CNFSRC = ./sys_conf
|
|
|
|
CNFS = $(CNFSRC)/imrc
|
|
|
|
PALS = $(CNFSRC)/im_palette.pal
|
|
|
|
! CNFFLAGS = -m 0644 -o root -g wheel
|
|
|
|
InstallMultipleFlags($(CNFS) $(PALS),$(CNFDIR),$(CNFFLAGS))
|
|
|
|
|
|
|
|
DependTarget()
|