/ Check-in [97fc4a71]
Login

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

Overview
Comment:Fix for ticket #138: Makefile doesn't use exec_prefix, has some install problems (CVS 724)
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 97fc4a71a12b52cda67b5192c3bd7bd10ac0c7a6
User & Date: jadams 2002-08-22 18:18:36
Context
2002-08-24
18:24
Change the way token memory is allocated in an effort to fix ticket #136. There is now a memory leak when using views of views. (CVS 725) check-in: 22d8726e user: drh tags: trunk
2002-08-22
18:18
Fix for ticket #138: Makefile doesn't use exec_prefix, has some install problems (CVS 724) check-in: 97fc4a71 user: jadams tags: trunk
2002-08-21
11:26
Fix for ticket #137: Use getpwuid() instead of getpwent(). (CVS 723) check-in: ea011990 user: drh tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to Makefile.in.

    27     27   # same unless your are cross-compiling.)
    28     28   #
    29     29   TCC = @TARGET_CC@ @TARGET_CFLAGS@ -I. -I${TOP}/src
    30     30   
    31     31   # Some standard variables and programs
    32     32   #
    33     33   prefix = @prefix@
           34  +exec_prefix = @exec_prefix@
    34     35   INSTALL = @INSTALL@
    35     36   LIBTOOL = ./libtool
    36     37   
    37     38   # Compiler options needed for programs that use the TCL library.
    38     39   #
    39     40   TCL_FLAGS = @TARGET_TCL_INC@
    40     41   
................................................................................
   117    118   # of the most recently modified source code file
   118    119   #
   119    120   last_change:	$(SRC)
   120    121   	cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
   121    122             | awk '{print $$5,$$6}' >last_change
   122    123   
   123    124   libsqlite.la:	$(LIBOBJ)
   124         -	$(LIBTOOL) $(TCC) -o libsqlite.la $(LIBOBJ) -rpath $(prefix)/lib
          125  +	$(LIBTOOL) $(TCC) -o libsqlite.la $(LIBOBJ) -rpath $(exec_prefix)/lib
   125    126   
   126    127   libtclsqlite.la:	tclsqlite.lo libsqlite.la
   127    128   	$(LIBTOOL) $(TCC) -o libtclsqlite.la tclsqlite.lo \
   128         -		libsqlite.la $(LIBTCL) -rpath $(prefix)/lib
          129  +		libsqlite.la $(LIBTCL) -rpath $(exec_prefix)/lib
   129    130   
   130    131   sqlite:	$(TOP)/src/shell.c libsqlite.la sqlite.h
   131    132   	$(LIBTOOL) $(TCC) $(READLINE_FLAGS) -o sqlite $(TOP)/src/shell.c \
   132         -		libsqlite.la $(LIBREADLINE)
          133  +		libsqlite.la $(LIBREADLINE) -rpath $(exec_prefix)/lib
   133    134   
   134    135   # Rules to build the LEMON compiler generator
   135    136   #
   136    137   lemon:	$(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
   137    138   	$(BCC) -o lemon $(TOP)/tool/lemon.c
   138    139   	cp $(TOP)/tool/lempar.c .
   139    140   
................................................................................
   305    306     faq.html
   306    307   
   307    308   doc:	$(DOC)
   308    309   	mkdir -p doc
   309    310   	mv $(DOC) doc
   310    311   
   311    312   install:	sqlite libsqlite.la sqlite.h
   312         -	$(LIBTOOL) $(INSTALL) libsqlite.la $(prefix)/lib
   313         -	$(LIBTOOL) $(INSTALL) sqlite $(prefix)/bin
          313  +	$(INSTALL) -d $(exec_prefix)/lib
          314  +	$(LIBTOOL) $(INSTALL) libsqlite.la $(exec_prefix)/lib
          315  +	$(INSTALL) -d $(exec_prefix)/bin
          316  +	$(LIBTOOL) $(INSTALL) sqlite $(exec_prefix)/bin
          317  +	$(INSTALL) -d $(prefix)/include
   314    318   	$(INSTALL) -m 0644 sqlite.h $(prefix)/include
   315    319   
   316    320   clean:	
   317    321   	rm -f *.lo *.la *.o sqlite libsqlite.la sqlite.h
   318    322   	rm -rf .libs .deps 
   319    323   	rm -f lemon lempar.c parse.* sqlite*.tar.gz
   320    324   	rm -f $(PUBLISH)
   321    325   	rm -f *.da *.bb *.bbg gmon.out
   322    326   	rm -f testfixture test.db
   323    327   	rm -rf doc
   324    328   
   325    329   distclean:	clean
   326    330   	rm -f config.log config.status