--- gdk/Makefile.in.orig	Thu Nov 26 06:19:22 1998
+++ gdk/Makefile.in	Thu Nov 26 06:19:54 1998
@@ -81,7 +81,7 @@
 
 gdkincludedir = $(includedir)/gdk
 
-lib_LTLIBRARIES = libgdk.la
+lib_LTLIBRARIES = libgdkjp.la
 
 libgdk_la_SOURCES = \
 	gdk.c		\
@@ -256,7 +256,7 @@
 
 maintainer-clean-libtool:
 
-libgdk.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
+libgdkjp.la: $(libgdk_la_OBJECTS) $(libgdk_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libgdk_la_LDFLAGS) $(libgdk_la_OBJECTS) $(libgdk_la_LIBADD) $(LIBS)
 
 mostlyclean-binPROGRAMS:
--- gtk/Makefile.in.orig	Mon Sep 21 13:20:39 1998
+++ gtk/Makefile.in	Thu Nov 26 06:21:33 1998
@@ -81,7 +81,7 @@
 
 gtkincludedir = $(includedir)/gtk
 
-lib_LTLIBRARIES = libgtk.la
+lib_LTLIBRARIES = libgtkjp.la
 
 libgtk_la_SOURCES = \
 	gtkaccelerator.c	\
@@ -299,41 +299,41 @@
 noinst_PROGRAMS = testgtk testinput testselection simple 
 
 testgtk_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
+	libgtkjp.la				\
+	$(top_builddir)/gdk/libgdkjp.la		\
 	@x_ldflags@				\
 	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
+	$(top_builddir)/glib/libglibjp.la	\
 	-lm
 
 testinput_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
+	libgtkjp.la				\
+	$(top_builddir)/gdk/libgdkjp.la		\
 	@x_ldflags@				\
 	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
+	$(top_builddir)/glib/libglibjp.la	\
 	-lm
 
 testselection_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
+	libgtkjp.la				\
+	$(top_builddir)/gdk/libgdkjp.la		\
 	@x_ldflags@				\
 	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
+	$(top_builddir)/glib/libglibjp.la	\
 	-lm
 
 simple_LDADD = \
-	libgtk.la				\
-	$(top_builddir)/gdk/libgdk.la		\
+	libgtkjp.la				\
+	$(top_builddir)/gdk/libgdkjp.la		\
 	@x_ldflags@				\
 	@x_libs@				\
-	$(top_builddir)/glib/libglib.la		\
+	$(top_builddir)/glib/libglibjp.la	\
 	-lm
 
 DEPS = \
-	libgtk.la		                \
-	$(top_builddir)/gdk/libgdk.la		\
-	$(top_builddir)/glib/libglib.la
+	libgtkjp.la		                \
+	$(top_builddir)/gdk/libgdkjp.la		\
+	$(top_builddir)/glib/libglibjp.la
 
 testgtk_DEPENDENCIES = $(DEPS)
 testinput_DEPENDENCIES = $(DEPS)
@@ -404,7 +404,7 @@
 SOURCES = $(libgtk_la_SOURCES) testgtk.c testinput.c testselection.c simple.c
 OBJECTS = $(libgtk_la_OBJECTS) testgtk.o testinput.o testselection.o simple.o
 
-all: Makefile $(LTLIBRARIES) $(PROGRAMS) $(HEADERS)
+all: Makefile $(LTLIBRARIES) $(HEADERS)
 
 .SUFFIXES:
 .SUFFIXES: .S .c .lo .o .s
@@ -481,7 +481,7 @@
 
 maintainer-clean-libtool:
 
-libgtk.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
+libgtkjp.la: $(libgtk_la_OBJECTS) $(libgtk_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libgtk_la_LDFLAGS) $(libgtk_la_OBJECTS) $(libgtk_la_LIBADD) $(LIBS)
 
 mostlyclean-noinstPROGRAMS:
--- glib/Makefile.in.orig	Mon Sep 21 13:20:33 1998
+++ glib/Makefile.in	Thu Nov 26 06:22:56 1998
@@ -74,9 +74,7 @@
 RANLIB = @RANLIB@
 VERSION = @VERSION@
 
-configincludedir = $(pkglibdir)/include
-
-lib_LTLIBRARIES = libglib.la
+lib_LTLIBRARIES = libglibjp.la
 
 libglib_la_SOURCES = \
 		garray.c	\
@@ -95,17 +93,14 @@
 		gutils.c
 
 include_HEADERS = \
-		glib.h
-
-configinclude_DATA = \
-		glibconfig.h
+		glib.h glibconfig.h
 
 libglib_la_LDFLAGS = -version-info $(GLIB_MAJOR_VERSION):$(GLIB_MICRO_VERSION):0
 
 INCLUDES = -I$(top_srcdir)
 
 noinst_PROGRAMS = testglib
-testglib_LDADD = libglib.la
+testglib_LDADD = libglibjp.la
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = glibconfig.h
@@ -125,7 +120,7 @@
 
 testglib_SOURCES = testglib.c
 testglib_OBJECTS =  testglib.o
-testglib_DEPENDENCIES =  libglib.la
+testglib_DEPENDENCIES =  libglibjp.la
 testglib_LDFLAGS = 
 CFLAGS = @CFLAGS@
 COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
@@ -251,7 +246,7 @@
 
 maintainer-clean-libtool:
 
-libglib.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
+libglibjp.la: $(libglib_la_OBJECTS) $(libglib_la_DEPENDENCIES)
 	$(LINK) -rpath $(libdir) $(libglib_la_LDFLAGS) $(libglib_la_OBJECTS) $(libglib_la_LIBADD) $(LIBS)
 
 mostlyclean-noinstPROGRAMS:
--- Makefile.in.orig	Mon Sep 21 13:20:30 1998
+++ Makefile.in	Thu Nov 26 06:18:17 1998
@@ -80,7 +80,7 @@
 xinput_progs = @xinput_progs@
 
 SRC_SUBDIRS = glib gdk gtk
-SUBDIRS = $(SRC_SUBDIRS) docs
+SUBDIRS = $(SRC_SUBDIRS)
 
 bin_SCRIPTS = gtk-config
 
@@ -400,7 +400,7 @@
 install-data: install-data-recursive install-data-am
 	@$(NORMAL_INSTALL)
 
-install: install-recursive install-exec-am install-data-am
+install: install-recursive install-exec-am
 	@:
 
 uninstall: uninstall-recursive uninstall-am
