Annotation of pkgsrc/databases/xsqlmenu/patches/patch-aa, revision 1.2

1.1       hubertf     1: $NetBSD$
                      2: 
1.2     ! fredb       3: --- Makefile.orig      Sun Aug 27 22:57:00 2000
1.1       hubertf     4: +++ Makefile
1.2     ! fredb       5: @@ -8,36 +8,43 @@
1.1       hubertf     6:  all: xsqlmenu
                      7:  
                      8:  #XFORMSBASE = /opt/lib
                      9: -XFORMSBASE = /usr/X11R6/lib
                     10: +XFORMSBASE = ${PREFIX}
                     11:  ifeq (${DB},msql)
                     12:  # Set MSQLBASE to the place where your MiniSQL distribution resides !
                     13:  #MSQLBASE = /opt/lib/Hughes
                     14:  MSQLBASE = /usr/local/Hughes
                     15:  else
                     16: -MYSQLPREFIX = /usr
                     17: +MYSQLPREFIX = ${LOCALBASE}
                     18:  endif
                     19:  
                     20:  ifeq (${DB},msql)
1.2     ! fredb      21:  CFLAGS  = -O -Wall -I$(MSQLBASE)/include
        !            22:  LDFLAGS = -L $(MSQLBASE)/lib -lmsql -L$(XFORMSBASE) -lforms -lXpm \
        !            23: +        -L$(LOCALBASE)/lib -ljpeg \
        !            24:            -L/usr/X11R6/lib -lX11 -lm
        !            25:  LDSTATICFLAGS= -L $(MSQLBASE)/lib -lmsql $(XFORMSBASE)/libforms.a \
        !            26: +        $(LOCALBASE)/lib/libjpeg.a \
        !            27:            $(XFORMSBASE)/libXpm.a -L/usr/X11R6/lib -lX11 -lm
1.1       hubertf    28:  .msql:
                     29:        touch .msql
                     30:        rm -f .mysql
                     31: -      make clean
                     32: +      gmake clean
                     33:  TYPE=.msql
                     34:  else
                     35: -CFLAGS  = -O -Wall -I$(MYSQLPREFIX)/include/mysql -DUSE_MYSQL
                     36: -LDFLAGS = -L $(MYSQLPREFIX)/lib/mysql -lmysqlclient -L$(XFORMSBASE) -lforms \
                     37: -      -lXpm -L/usr/X11R6/lib -lX11 -lm
                     38: +CFLAGS  = -O -Wall -I$(MYSQLPREFIX)/include/mysql -DUSE_MYSQL \
                     39: +        -I${X11BASE}/include/X11 \
                     40: +        -I${X11BASE}/include \
                     41: +        -I${LOCALBASE}/include
                     42: +LDFLAGS = -L$(MYSQLPREFIX)/lib/mysql -Wl,-R$(MYSQLPREFIX)/lib/mysql -lmysqlclient -L$(XFORMSBASE) -Wl,-R$(XFORMSBASE) -lforms \
1.2     ! fredb      43: +        -L$(LOCALBASE)/lib -Wl,-R$(LOCALBASE)/lib -ljpeg \
1.1       hubertf    44: +      -lXpm -L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lX11 -lm
                     45:  LDSTATICFLAGS= -L $(MYSQLPREFIX)/lib/mysql -lmysqlclient $(XFORMSBASE)/libforms.a \
1.2     ! fredb      46: +        $(LOCALBASE)/lib/libjpeg.a \
1.1       hubertf    47:            $(XFORMSBASE)/libXpm.a -L/usr/X11R6/lib -lX11 -lm
                     48:  .mysql:
                     49:        touch .mysql
                     50:        rm -f .msql
                     51: -      make clean
                     52: +      gmake clean
                     53:  TYPE=.mysql
                     54:  endif
                     55:  

CVSweb <webmaster@jp.NetBSD.org>