Hello
Please apply the attached patch to fix the following problems in Xbae
Imake support:
* Xbae/Xbae.tmpl contains wrong revision numbers;
* Xbae/include/Xbae/Imakefile generates a Makefile that is not
compatible with non-GNU make programs and that removes Matrix.h
Caption.h and Input.h when I issue a "make clean".
* Xbae/src/Imakefile doesn't install any manual page.
BTW, I sent some days ago a patch with a proposed new Imake support for
LessTif that already contained the above fixes. Since there was no
modificantins in the Imake support since than, I suppose that the patch
was rejected. :-(
--
Carlos A. M. dos Santos
Federal University of Pelotas Meteorological Research Center
Av. Ildefonso Simoes Lopes 2791 Pelotas, RS, Brasil, CEP 96060-290
WWW: http://www.cpmet.ufpel.tche.br RENPAC (X.25): 153231641
Phone: +55 53 277-6767 FAX: +55 53 277-6722
diff -durP Xbae.old/Xbae.tmpl Xbae/Xbae.tmpl
--- Xbae.old/Xbae.tmpl Thu Jul 20 03:07:13 2000
+++ Xbae/Xbae.tmpl Tue Jul 11 12:00:04 2000
@@ -131,8 +137,8 @@
XCOMM YES. Again, don't change this, unless you know what you are doing.
XbaeVERSION=4
-XbaeREVISION=7
-XbaeUPDATE=1
+XbaeREVISION=8
+XbaeUPDATE=3
XBAEVERSION=$(XbaeVERSION).$(XbaeREVISION)
XbaeSharedLibraryRevision=$(XbaeREVISION).$(XbaeUPDATE)
diff -durP Xbae.old/include/Xbae/Imakefile Xbae/include/Xbae/Imakefile
--- Xbae.old/include/Xbae/Imakefile Thu Jul 20 03:07:20 2000
+++ Xbae/include/Xbae/Imakefile Fri Jul 7 21:46:55 2000
@@ -1,6 +1,4 @@
#include "../../Xbae.tmpl"
- HEADERS_IN = Matrix.h.in Caption.h.in Input.h.in
- HEADERS_OUT = $(HEADERS_IN:.h.in=.h)
HEADERS = Matrix.h MatrixP.h Clip.h ClipP.h Caption.h \
CaptionP.h Input.h InputP.h
@@ -10,19 +8,18 @@
InstallMultiple($(HEADERS),$(INCROOT)/Xbae-$(XBAEVERSION))
#endif
-includes:: $(HEADERS_OUT)
+/* For the case one forgeting to "make World" or at least "make includes" */
+all:: patchlevel.h
+
+includes:: patchlevel.h
depend::
clean::
- $(RM) $(HEADERS_OUT)
-
-XCOMM Generic rule for translating configure's .h.in file to a real .h
-%.h: %.h.in
- $(SED) -e 's/@XBAE_MAJOR@/$(XbaeVERSION)/' \
- -e 's/@XBAE_MINOR@/$(XbaeREVISION)/' \
- -e 's/@XBAE_PICO@/$(XbaeUPDATE)/' < [email protected] > $@
+ $(RM) patchlevel.h
-Matrix.h: Matrix.h.in
-Caption.h: Caption.h.in
-Input.h: Input.h.in
+XCOMM Rule for translating configure's .h.in file to a real .h
+patchlevel.h: patchlevel.h.in
+ $(SED) 's/@XBAE_MAJOR@/$(XbaeVERSION)/; \ @@\
+ s/@XBAE_MINOR@/$(XbaeREVISION)/; \ @@\
+ s/@XBAE_PICO@/$(XbaeUPDATE)/' < [email protected] > $@
diff -durP Xbae.old/src/Imakefile Xbae/src/Imakefile
--- Xbae.old/src/Imakefile Thu Jul 20 03:07:21 2000
+++ Xbae/src/Imakefile Mon Jul 10 13:29:31 2000
@@ -27,6 +27,7 @@
INCLUDES = -I../include
MATRIXMAN = XbaeMatrix
+ INPUTMAN = XbaeInput
CAPTIONMAN = XbaeCaption
MANSUFFIX = 3
MANDIR = $(MANSOURCEPATH)$(MANSUFFIX)
@@ -103,6 +104,7 @@
#endif /* X11R5 or X11R4 */
InstallManPage($(MATRIXMAN),$(MANDIR))
+InstallManPage($(INPUTMAN),$(MANDIR))
InstallManPage($(CAPTIONMAN),$(MANDIR))
DependTarget()
@@ -114,3 +116,26 @@
$(RM) $(INCROOT)/Xbae; \
fi
$(LN) $(INCROOT)/Xbae-$(XBAEVERSION) $(INCROOT)/Xbae
+
+XCOMM Rules for translating manual.3.in to manual.3
+
+clean::
+ $(RM) $(MATRIXMAN).man $(INPUTMAN).man $(CAPTIONMAN).man
+
+$(MATRIXMAN).man: $(MATRIXMAN).$(MANSUFFIX).in
+ $(SED) 's/@PACKAGE@/Xbae/;\ @@\
+ s/@XBAE_MAJOR@/$(XbaeVERSION)/;\ @@\
+ s/@XBAE_MINOR@/$(XbaeREVISION)/;\ @@\
+ s/@XBAE_PICO@/$(XbaeUPDATE)/' < $> > $@
+
+$(INPUTMAN).man: $(INPUTMAN).$(MANSUFFIX).in
+ $(SED) 's/@PACKAGE@/Xbae/;\ @@\
+ s/@XBAE_MAJOR@/$(XbaeVERSION)/;\ @@\
+ s/@XBAE_MINOR@/$(XbaeREVISION)/;\ @@\
+ s/@XBAE_PICO@/$(XbaeUPDATE)/' < $> > $@
+
+$(CAPTIONMAN).man: $(CAPTIONMAN).$(MANSUFFIX).in
+ $(SED) 's/@PACKAGE@/Xbae/;\ @@\
+ s/@XBAE_MAJOR@/$(XbaeVERSION)/;\ @@\
+ s/@XBAE_MINOR@/$(XbaeREVISION)/;\ @@\
+ s/@XBAE_PICO@/$(XbaeUPDATE)/' < $> > $@
