rev 154 - in trunk: . modules modules/Dict modules/File modules/Float modules/List modules/Re modules/String modules/Tuple src
SVN User <[email protected]>
| Newsgroups | gmane.comp.lang.prothon.cvs |
|---|---|
| Message-ID | <[email protected]> |
Author: bcollins Date: 2004-03-27 11:54:54 -0500 (Sat, 27 Mar 2004) New Revision: 154 Modified: trunk/Rules.mk.in trunk/modules/Dict/Makefile.in trunk/modules/File/Makefile.in trunk/modules/Float/Makefile.in trunk/modules/List/Makefile.in trunk/modules/Makefile.in trunk/modules/Re/Makefile.in trunk/modules/String/Makefile.in trunk/modules/Tuple/Makefile.in trunk/src/Makefile.in trunk/src/interp.c Log: Few more cleanups. Modified: trunk/Rules.mk.in =================================================================== --- trunk/Rules.mk.in 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/Rules.mk.in 2004-03-27 16:54:54 UTC (rev 154) @@ -42,8 +42,8 @@ LINK = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) \ -export-dynamic $(LINK_LIBTOOL) $(LIBS) LINK_MODULE = $(LIBTOOL) $(LTFLAGS) --mode=link $(CC) -module -avoid-version \ - -export-dynamic dll_export -module -rpath $(libdir) $(CFLAGS) \ - $(LDFLAGS) $(LINK_LIBTOOL) $(LIBS) + -export-dynamic dll_export -module -rpath $(PROTHON_DEFAULT_MODDIR) \ + $(CFLAGS) $(LDFLAGS) $(LINK_LIBTOOL) $(LIBS) LIB_INSTALL = $(LIBTOOL) --mode=install $(INSTALL) Modified: trunk/modules/Dict/Makefile.in =================================================================== --- trunk/modules/Dict/Makefile.in 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/modules/Dict/Makefile.in 2004-03-27 16:54:54 UTC (rev 154) @@ -19,7 +19,7 @@ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@ install: $(TARGET) - $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/ + $(LIB_INSTALL) $(TARGET) $(DESTDIR)$(PROTHON_DEFAULT_MODDIR)/ distclean: clean rm -f Makefile Modified: trunk/modules/File/Makefile.in =================================================================== --- trunk/modules/File/Makefile.in 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/modules/File/Makefile.in 2004-03-27 16:54:54 UTC (rev 154) @@ -19,7 +19,7 @@ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@ install: $(TARGET) - $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/ + $(LIB_INSTALL) $(TARGET) $(DESTDIR)$(PROTHON_DEFAULT_MODDIR)/ distclean: clean rm -f Makefile Modified: trunk/modules/Float/Makefile.in =================================================================== --- trunk/modules/Float/Makefile.in 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/modules/Float/Makefile.in 2004-03-27 16:54:54 UTC (rev 154) @@ -19,7 +19,7 @@ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@ install: $(TARGET) - $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/ + $(LIB_INSTALL) $(TARGET) $(DESTDIR)$(PROTHON_DEFAULT_MODDIR)/ distclean: clean rm -f Makefile Modified: trunk/modules/List/Makefile.in =================================================================== --- trunk/modules/List/Makefile.in 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/modules/List/Makefile.in 2004-03-27 16:54:54 UTC (rev 154) @@ -19,7 +19,7 @@ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@ install: $(TARGET) - $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/ + $(LIB_INSTALL) $(TARGET) $(DESTDIR)$(PROTHON_DEFAULT_MODDIR)/ distclean: clean rm -f Makefile Modified: trunk/modules/Makefile.in =================================================================== --- trunk/modules/Makefile.in 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/modules/Makefile.in 2004-03-27 16:54:54 UTC (rev 154) @@ -15,7 +15,7 @@ done install: - $(INSTALL_DIR) $(PROTHON_DEFAULT_MODDIR) + $(INSTALL_DIR) $(DESTDIR)$(PROTHON_DEFAULT_MODDIR) @for subdir in $(MODULES); do \ $(MAKE) -C $$subdir $@; \ done Modified: trunk/modules/Re/Makefile.in =================================================================== --- trunk/modules/Re/Makefile.in 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/modules/Re/Makefile.in 2004-03-27 16:54:54 UTC (rev 154) @@ -26,7 +26,7 @@ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@ install: $(TARGET) - $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/ + $(LIB_INSTALL) $(TARGET) $(DESTDIR)$(PROTHON_DEFAULT_MODDIR)/ distclean: clean rm -f Makefile Modified: trunk/modules/String/Makefile.in =================================================================== --- trunk/modules/String/Makefile.in 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/modules/String/Makefile.in 2004-03-27 16:54:54 UTC (rev 154) @@ -19,7 +19,7 @@ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@ install: $(TARGET) - $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/ + $(LIB_INSTALL) $(TARGET) $(DESTDIR)$(PROTHON_DEFAULT_MODDIR)/ distclean: clean rm -f Makefile Modified: trunk/modules/Tuple/Makefile.in =================================================================== --- trunk/modules/Tuple/Makefile.in 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/modules/Tuple/Makefile.in 2004-03-27 16:54:54 UTC (rev 154) @@ -19,7 +19,7 @@ $(LINK_MODULE) $(BOOST_REGEX_LIBS) $(OBJS) -o $@ install: $(TARGET) - $(LIB_INSTALL) $(TARGET) $(PROTHON_DEFAULT_MODDIR)/ + $(LIB_INSTALL) $(TARGET) $(DESTDIR)$(PROTHON_DEFAULT_MODDIR)/ distclean: clean rm -f Makefile Modified: trunk/src/Makefile.in =================================================================== --- trunk/src/Makefile.in 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/src/Makefile.in 2004-03-27 16:54:54 UTC (rev 154) @@ -18,6 +18,7 @@ $(LINK) $(OBJS) -o $@ install: $(TARGET) + $(INSTALL_DIR) $(DESTDIR)$(bindir) $(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)/$(TARGET) distclean: clean Modified: trunk/src/interp.c =================================================================== --- trunk/src/interp.c 2004-03-27 16:46:33 UTC (rev 153) +++ trunk/src/interp.c 2004-03-27 16:54:54 UTC (rev 154) @@ -320,7 +320,7 @@ apr_status_t aprerr; strcat(full_path, module_name); -#ifdef __unix__ +#ifndef WIN32 strcat(full_path, ".so"); #endif aprerr = apr_dso_load(&handle, full_path, get_pr_head_pool());