Index: ossp-pkg/js/Makefile.in
RCS File: /v/ossp/cvs/ossp-pkg/js/Makefile.in,v
rcsdiff -q -kk '-r1.16' '-r1.17' -u '/v/ossp/cvs/ossp-pkg/js/Makefile.in,v' 2>/dev/null
--- Makefile.in	2006/07/22 20:31:56	1.16
+++ Makefile.in	2006/07/22 20:37:02	1.17
@@ -60,54 +60,15 @@
 PERL         = @PERL@
 TRUE         = true
 
-LIB_HDR_API  = src/jsapi.h                 \
-               src/jsdbgapi.h
-LIB_HDR_CPP  = src/jsarena.h               \
-               src/jsarray.h               \
-               src/jsatom.h                \
-               src/jsbool.h                \
-               src/jsclist.h               \
-               src/jscntxt.h               \
-               src/jsconfig.h              \
-               src/jsdate.h                \
-               src/jsdhash.h               \
-               src/jsdtoa.h                \
-               src/jsemit.h                \
-               src/jsexn.h                 \
-               src/jsfun.h                 \
-               src/jsgc.h                  \
-               src/jshash.h                \
-               src/jsinterp.h              \
-               src/jslibmath.h             \
-               src/jslock.h                \
+LIB_HDRS     = src/jsautocfg.h             \
+               src/jsapi.h                 \
+               src/jsdbgapi.h              \
+               src/jscompat.h              \
                src/jslong.h                \
-               src/jsmath.h                \
-               src/jsnum.h                 \
-               src/jsobj.h                 \
-               src/jsopcode.h              \
                src/jsosdep.h               \
-               src/jsparse.h               \
-               src/jsprvtd.h               \
-               src/jspubtd.h               \
-               src/jsregexp.h              \
-               src/jsscan.h                \
-               src/jsscope.h               \
-               src/jsscript.h              \
-               src/jsstr.h                 \
-               src/jstypes.h               \
-               src/jsxdrapi.h              \
-               src/jsxml.h                 \
-               src/jsfile.h
-LIB_HDR_OTH  = src/jsbit.h                 \
-               src/jscompat.h              \
-               src/jscpucfg.h              \
                src/jsotypes.h              \
-               src/jsstddef.h              \
-               src/prmjtime.h              \
-               src/resource.h              \
-               src/jsopcode.tbl            \
-               src/js.msg                  \
-               src/jsshell.msg
+               src/jspubtd.h               \
+               src/jstypes.h
 LIB_OBJS     = src/jsapi.lo                \
                src/jsarena.lo              \
                src/jsarray.lo              \
@@ -183,12 +144,12 @@
 
 WITH_PERL    = @WITH_PERL@
 
-TARGETS      = $(LIB_NAME) $(CLI_NAME) subdirs
+TARGETS      = $(LIB_NAME) $(CLI_NAME)
 
 .SUFFIXES:
 .SUFFIXES: .c .o .lo
 
-all: $(TARGETS)
+all: $(TARGETS) subdirs
 
 subdirs:
 	@if [ ".$(WITH_PERL)" = ".yes" ]; then \
@@ -202,8 +163,7 @@
 	@$(LIBTOOL) --mode=compile $(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $<
 
 $(LIB_NAME): $(LIB_OBJS)
-	@$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) \
-	    -version-info 0:0
+	@$(LIBTOOL) --mode=link $(CC) -o $(LIB_NAME) $(LIB_OBJS) -rpath $(libdir) -version-info 0:0
 
 $(CLI_NAME): $(CLI_OBJS)
 	@$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(CLI_LDFLAGS) -o $(CLI_NAME) $(CLI_OBJS) $(LIB_NAME) $(LIBS) $(CLI_LIBS)
@@ -228,12 +188,12 @@
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(bindir)
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man1
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(mandir)/man3
-	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)
+	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(includedir)/js
 	$(SHTOOL) mkdir -f -p -m 755 $(DESTDIR)$(libdir)/pkgconfig
 	$(SHTOOL) install -c -m 755 js $(DESTDIR)$(bindir)/
 	$(SHTOOL) install -c -m 644 js.1 $(DESTDIR)$(mandir)/man1/
 	$(SHTOOL) install -c -m 644 js.3 $(DESTDIR)$(mandir)/man3/
-	$(SHTOOL) install -c -m 644 $(LIB_HDR_API) $(DESTDIR)$(includedir)/
+	$(SHTOOL) install -c -m 644 $(LIB_HDRS) $(DESTDIR)$(includedir)/js/
 	@$(LIBTOOL) --mode=install $(SHTOOL) install -c -m 644 $(LIB_NAME) $(DESTDIR)$(libdir)/
 	$(SHTOOL) install -c -m 644 js.pc $(DESTDIR)$(libdir)/pkgconfig/
 	@if [ ".$(WITH_PERL)" = ".yes" ]; then \
Index: ossp-pkg/js/js.pc.in
RCS File: /v/ossp/cvs/ossp-pkg/js/js.pc.in,v
rcsdiff -q -kk '-r1.2' '-r1.3' -u '/v/ossp/cvs/ossp-pkg/js/js.pc.in,v' 2>/dev/null
--- js.pc.in	2006/07/22 13:48:03	1.2
+++ js.pc.in	2006/07/22 20:37:02	1.3
@@ -1,10 +1,10 @@
 prefix=@prefix@
 exec_prefix=${prefix}
 libdir=${exec_prefix}/lib
-includedir=${prefix}/include/js
+includedir=${prefix}/include
 
 Name: OSSP js
 Description: JavaScript Engine
 Version: @version@
 Libs: -L${libdir} -ljs @LIBS@
-Cflags: -DXP_UNIX -I${includedir}
+Cflags: -DXP_UNIX -I${includedir}/js