Changeset 7463

Timestamp:

2004-05-27T14:06:49+12:00 (20 years ago)

Author:

kjdon

Message:

small tidyup

Location:

trunk

Files:

• gsdl3/packages/mg/Makefile.in (modified) (1 diff)
• gsdl3/packages/mg/jni/win32.mak (modified) (1 diff)
• gsdl3/packages/mg/src/text/Makefile.in (modified) (2 diffs)
• gsdl3/packages/mg/src/text/WIN32.MAK (modified) (3 diffs)
• gsdl3/src/packages/mg/Makefile.in (modified) (1 diff)
• gsdl3/src/packages/mg/jni/win32.mak (modified) (1 diff)
• gsdl3/src/packages/mg/src/text/Makefile.in (modified) (2 diffs)
• gsdl3/src/packages/mg/src/text/WIN32.MAK (modified) (3 diffs)
• indexers/mg/Makefile.in (modified) (1 diff)
• indexers/mg/jni/win32.mak (modified) (1 diff)
• indexers/mg/src/text/Makefile.in (modified) (2 diffs)
• indexers/mg/src/text/WIN32.MAK (modified) (3 diffs)

trunk/gsdl3/packages/mg/Makefile.in

@@ -47 +47 @@
 
 SUBDIRS = lib src/text src/images src/scripts java/org/greenstone/mg jni
-#SUBDIRS = lib src/text
-
 
 .SUFFIXES:

trunk/gsdl3/packages/mg/jni/win32.mak

@@ -78 +78 @@
 clean:
         if exist *$o del *$o 
+    if exist mgjni.dll del mgjni.dll
+    if exist mgpassjni.dll del mgpassjni.dll

trunk/gsdl3/packages/mg/src/text/Makefile.in

@@ -44 +44 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
-#LIBS = ../../lib/libmg.a -lm
 LIBS = ../../lib/libmg.a @LIBS@
 TOUCH = echo timestamp >
@@ -58 +57 @@
 
  
-bindir = ../../../../bin
+bindir = $(exec_prefix)/bin
 datadir = $(prefix)/share
 libexecdir = $(exec_prefix)/libexec

trunk/gsdl3/packages/mg/src/text/WIN32.MAK

@@ -214 +214 @@
     term_lists$o bool_tree$o bool_parser$o bool_optimiser$o \
         bool_query$o words$o
+
 JNI_LIB_OBJS = \
     mg_passes_4jni$o text.pass1$o comp_dict$o stemmer$o \
@@ -229 +230 @@
       if exist libmgpass.lib del libmgpass.lib
     $(AR) /out:libmgpass.lib $(JNI_LIB_OBJS)
+
 install: 
     for %%i in ($(EXEC)) do \
       copy %%i "$(GSDL3HOME)\bin"
-    
 
 clean:
@@ -239 +240 @@
         if exist libmgtextin.lib del libmgtextin.lib
         if exist libmgpass.lib del libmgpass.lib
-

trunk/gsdl3/src/packages/mg/Makefile.in

@@ -47 +47 @@
 
 SUBDIRS = lib src/text src/images src/scripts java/org/greenstone/mg jni
-#SUBDIRS = lib src/text
-
 
 .SUFFIXES:

trunk/gsdl3/src/packages/mg/jni/win32.mak

@@ -78 +78 @@
 clean:
         if exist *$o del *$o 
+    if exist mgjni.dll del mgjni.dll
+    if exist mgpassjni.dll del mgpassjni.dll

trunk/gsdl3/src/packages/mg/src/text/Makefile.in

@@ -44 +44 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
-#LIBS = ../../lib/libmg.a -lm
 LIBS = ../../lib/libmg.a @LIBS@
 TOUCH = echo timestamp >
@@ -58 +57 @@
 
  
-bindir = ../../../../bin
+bindir = $(exec_prefix)/bin
 datadir = $(prefix)/share
 libexecdir = $(exec_prefix)/libexec

trunk/gsdl3/src/packages/mg/src/text/WIN32.MAK

@@ -214 +214 @@
     term_lists$o bool_tree$o bool_parser$o bool_optimiser$o \
         bool_query$o words$o
+
 JNI_LIB_OBJS = \
     mg_passes_4jni$o text.pass1$o comp_dict$o stemmer$o \
@@ -229 +230 @@
       if exist libmgpass.lib del libmgpass.lib
     $(AR) /out:libmgpass.lib $(JNI_LIB_OBJS)
+
 install: 
     for %%i in ($(EXEC)) do \
       copy %%i "$(GSDL3HOME)\bin"
-    
 
 clean:
@@ -239 +240 @@
         if exist libmgtextin.lib del libmgtextin.lib
         if exist libmgpass.lib del libmgpass.lib
-

trunk/indexers/mg/Makefile.in

@@ -47 +47 @@
 
 SUBDIRS = lib src/text src/images src/scripts java/org/greenstone/mg jni
-#SUBDIRS = lib src/text
-
 
 .SUFFIXES:

trunk/indexers/mg/jni/win32.mak

@@ -78 +78 @@
 clean:
         if exist *$o del *$o 
+    if exist mgjni.dll del mgjni.dll
+    if exist mgpassjni.dll del mgpassjni.dll

trunk/indexers/mg/src/text/Makefile.in

@@ -44 +44 @@
 INSTALL_PROGRAM = @INSTALL_PROGRAM@
 LDFLAGS = @LDFLAGS@
-#LIBS = ../../lib/libmg.a -lm
 LIBS = ../../lib/libmg.a @LIBS@
 TOUCH = echo timestamp >
@@ -58 +57 @@
 
  
-bindir = ../../../../bin
+bindir = $(exec_prefix)/bin
 datadir = $(prefix)/share
 libexecdir = $(exec_prefix)/libexec

trunk/indexers/mg/src/text/WIN32.MAK

@@ -214 +214 @@
     term_lists$o bool_tree$o bool_parser$o bool_optimiser$o \
         bool_query$o words$o
+
 JNI_LIB_OBJS = \
     mg_passes_4jni$o text.pass1$o comp_dict$o stemmer$o \
@@ -229 +230 @@
       if exist libmgpass.lib del libmgpass.lib
     $(AR) /out:libmgpass.lib $(JNI_LIB_OBJS)
+
 install: 
     for %%i in ($(EXEC)) do \
       copy %%i "$(GSDL3HOME)\bin"
-    
 
 clean:
@@ -239 +240 @@
         if exist libmgtextin.lib del libmgtextin.lib
         if exist libmgpass.lib del libmgpass.lib
-