SQLite

Check-in [48c9fa97b9]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Respect user's configured bindir/libdir/includedir if present (fixes #558) (CVS 4827)
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 48c9fa97b9d9000f6fba5adb04c1026b162eb3ab
User & Date: mlcreech 2008-03-06 08:09:13.000
Context
2008-03-06
08:54
Miscellaneous autoconf cleanups - get rid of TARGET_CFLAGS, fix header list (CVS 4828) (check-in: a674f76db9 user: mlcreech tags: trunk)
08:09
Respect user's configured bindir/libdir/includedir if present (fixes #558) (CVS 4827) (check-in: 48c9fa97b9 user: mlcreech tags: trunk)
07:51
Actually use TARGET_CFLAGS on autoconf-driven builds (CVS 4826) (check-in: dda3d65899 user: mlcreech tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to Makefile.in.
︙︙
98
99
100
101
102
103
104
105
106
107


108
109
110
111
112
113
114

#
SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@

# The directory into which to store package information for

# Some standard variables and programs
#
prefix = @prefix@
exec_prefix = @exec_prefix@
libdir = @libdir@


INSTALL = @INSTALL@
LIBTOOL = ./libtool
ALLOWRELEASE = @ALLOWRELEASE@

# libtool compile/link/install
LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(TCC)
LTLINK = $(LIBTOOL) --mode=link $(TCC) @LDFLAGS@








<
<

>
>








98
99
100
101
102
103
104


105
106
107
108
109
110
111
112
113
114

#
SHLIB_SUFFIX = @TCL_SHLIB_SUFFIX@

# The directory into which to store package information for

# Some standard variables and programs
#


libdir = @libdir@
bindir = @bindir@
includedir = @includedir@
INSTALL = @INSTALL@
LIBTOOL = ./libtool
ALLOWRELEASE = @ALLOWRELEASE@

# libtool compile/link/install
LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(TCC)
LTLINK = $(LIBTOOL) --mode=link $(TCC) @LDFLAGS@
︙︙
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659

                -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
		libtclsqlite3.la $(LIBTCL)


install:	sqlite3$(BEXE) libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
	$(INSTALL) -d $(DESTDIR)$(libdir)
	$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
	$(INSTALL) -d $(DESTDIR)$(exec_prefix)/bin
	$(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(exec_prefix)/bin
	$(INSTALL) -d $(DESTDIR)$(prefix)/include
	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(prefix)/include
	$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(prefix)/include
	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; 
	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig; 

tcl_install:	libtclsqlite3.la
	tclsh $(TOP)/tclinstaller.tcl $(VERSION)

clean:	








|
|
|
|
|








641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659

                -o sqlite3_analyzer$(EXE) $(TESTSRC) $(TOP)/src/tclsqlite.c \
		libtclsqlite3.la $(LIBTCL)


install:	sqlite3$(BEXE) libsqlite3.la sqlite3.h ${HAVE_TCL:1=tcl_install}
	$(INSTALL) -d $(DESTDIR)$(libdir)
	$(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
	$(INSTALL) -d $(DESTDIR)$(bindir)
	$(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir)
	$(INSTALL) -d $(DESTDIR)$(includedir)
	$(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir)
	$(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir)
	$(INSTALL) -d $(DESTDIR)$(libdir)/pkgconfig; 
	$(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(libdir)/pkgconfig; 

tcl_install:	libtclsqlite3.la
	tclsh $(TOP)/tclinstaller.tcl $(VERSION)

clean:
︙︙