Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib More use of ${NETBSDSRCDIR}/some/path instead of ${.CURD...



details:   https://anonhg.NetBSD.org/src/rev/64fabfee8d29
branches:  trunk
changeset: 535455:64fabfee8d29
user:      lukem <lukem%NetBSD.org@localhost>
date:      Mon Aug 19 13:35:05 2002 +0000

description:
More use of ${NETBSDSRCDIR}/some/path instead of ${.CURDIR}/../../some/path

diffstat:

 lib/libasn1/Makefile               |   4 ++--
 lib/libasn1/asn1_compile/Makefile  |   4 ++--
 lib/libc/citrus/Makefile.inc       |   4 ++--
 lib/libcom_err/compile_et/Makefile |   4 ++--
 lib/libcrypto/Makefile             |   6 +++---
 lib/libedit/readline/Makefile      |   9 ++++++---
 lib/libgssapi/Makefile             |   6 +++---
 lib/libhdb/Makefile                |  10 +++++-----
 lib/libkadm/Makefile               |   6 +++---
 lib/libkadm5clnt/Makefile          |  10 +++++-----
 lib/libkadm5srv/Makefile           |  10 +++++-----
 lib/libkdb/Makefile                |   4 ++--
 lib/libkrb/Makefile                |   4 ++--
 lib/libkrb5/Makefile               |   6 +++---
 14 files changed, 45 insertions(+), 42 deletions(-)

diffs (truncated from 323 to 300 lines):

diff -r 87dfe860a891 -r 64fabfee8d29 lib/libasn1/Makefile
--- a/lib/libasn1/Makefile      Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libasn1/Makefile      Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2002/08/19 09:41:27 lukem Exp $
+# $NetBSD: Makefile,v 1.21 2002/08/19 13:35:05 lukem Exp $
 
 NOLINT=                # defined
 
@@ -11,7 +11,7 @@
 LIB=           asn1
 
 .if ${USETOOLS} != "yes"
-COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILEETOBJ!= cd ${NETBSDSRCDIR}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET?=   ${COMPILEETOBJ}/compile_et
 
 ASN1COMPILEOBJ!=cd ${.CURDIR}/asn1_compile && ${PRINTOBJDIR}
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libasn1/asn1_compile/Makefile
--- a/lib/libasn1/asn1_compile/Makefile Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libasn1/asn1_compile/Makefile Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/08/19 09:41:27 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/19 13:35:06 lukem Exp $
 
 NOLINT=                # defined
 NOMAN=         # defined
@@ -38,7 +38,7 @@
 
 YHEADER=       # defined
 
-#LIBROKEN!=    cd ${.CURDIR}/../../libroken && ${PRINTOBJDIR}
+#LIBROKEN!=    cd ${NETBSDSRCDIR}/lib/libroken && ${PRINTOBJDIR}
 #       -I${LIBROKEN}                          \
 
 HOST_CPPFLAGS+= -I.                            \
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libc/citrus/Makefile.inc
--- a/lib/libc/citrus/Makefile.inc      Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libc/citrus/Makefile.inc      Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.1 2002/03/17 22:14:18 tshiozak Exp $
+#      $NetBSD: Makefile.inc,v 1.2 2002/08/19 13:35:06 lukem Exp $
 
 # sources
 .PATH: ${ARCHDIR}/citrus ${.CURDIR}/citrus
@@ -6,7 +6,7 @@
 CITRUS?=       yes
 
 .if ${CITRUS} == "yes"
-MODULE_SHLIB_MAJOR!= . ${.CURDIR}/../i18n_module/shlib_version ; echo $$major
+MODULE_SHLIB_MAJOR!= . ${NETBSDSRCDIR}/lib/i18n_module/shlib_version ; echo $$major
 CPPFLAGS+= -DI18NMODULE_MAJOR=${MODULE_SHLIB_MAJOR}
 
 SRCS+= citrus_ctype.c citrus_module.c citrus_none.c
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libcom_err/compile_et/Makefile
--- a/lib/libcom_err/compile_et/Makefile        Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libcom_err/compile_et/Makefile        Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2002/08/19 09:41:29 lukem Exp $
+# $NetBSD: Makefile,v 1.14 2002/08/19 13:35:06 lukem Exp $
 
 NOMAN=         # defined
 
@@ -17,7 +17,7 @@
 
 BINDIR=                /usr/bin
 
-LIBROKEN!=     cd ${.CURDIR}/../../libroken && ${PRINTOBJDIR}
+LIBROKEN!=     cd ${NETBSDSRCDIR}/lib/libroken && ${PRINTOBJDIR}
 
 HOST_CPPFLAGS+= -I.                            \
         -I${NETBSDSRCDIR}/include/heimdal      \
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libcrypto/Makefile
--- a/lib/libcrypto/Makefile    Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libcrypto/Makefile    Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.23 2002/08/19 09:41:29 lukem Exp $
+#      $NetBSD: Makefile,v 1.24 2002/08/19 13:35:07 lukem Exp $
 
 # RCSid:
 #      Id: Makefile,v 1.33 1998/11/11 11:53:53 sjg Exp
@@ -94,8 +94,8 @@
 
 .if ${MKPIC} != "no"
 
-DES_SHLIB_MAJOR != cd ${.CURDIR}/../libdes && ${MAKE} -B print-shlib-major
-DES_SHLIB_MINOR != cd ${.CURDIR}/../libdes && ${MAKE} -B print-shlib-minor
+DES_SHLIB_MAJOR != cd ${NETBSDSRCDIR}/lib/libdes && ${MAKE} -B print-shlib-major
+DES_SHLIB_MINOR != cd ${NETBSDSRCDIR}/lib/libdes && ${MAKE} -B print-shlib-minor
 
 .if ${MKPICINSTALL} != "no"
 SYMLINKS+=     libcrypto_pic.a ${LIBDIR}/libdes_pic.a
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libedit/readline/Makefile
--- a/lib/libedit/readline/Makefile     Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libedit/readline/Makefile     Mon Aug 19 13:35:05 2002 +0000
@@ -1,12 +1,15 @@
-#      $NetBSD: Makefile,v 1.5 2001/12/12 00:51:02 tv Exp $    
+#      $NetBSD: Makefile,v 1.6 2002/08/19 13:35:07 lukem Exp $ 
+
+NOOBJ=         # defined
 
-.PATH: ${CURDIR}/..
+.include <bsd.own.mk>
+
+.PATH: ${NETBSDSRCDIR}/lib/libedit
 
 INCS=          readline.h
 INCSDIR=       /usr/include/readline
 SYMLINKS=      readline.h ${INCSDIR}/history.h
 
-NOOBJ=         # defined
 
 incinstall:: linksinstall
 
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libgssapi/Makefile
--- a/lib/libgssapi/Makefile    Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libgssapi/Makefile    Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/08/19 09:41:30 lukem Exp $
+# $NetBSD: Makefile,v 1.9 2002/08/19 13:35:07 lukem Exp $
 
 NOLINT=                # defined
 
@@ -54,8 +54,8 @@
 INCS=          gssapi.h
 INCSDIR=       /usr/include/gssapi
 
-ASN1!=         cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR}
-KRB5!=         cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR}
+ASN1!=         cd ${NETBSDSRCDIR}/lib/libasn1 && ${PRINTOBJDIR}
+KRB5!=         cd ${NETBSDSRCDIR}/lib/libkrb5 && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.                                 \
         -I${DIST}/heimdal/lib/gssapi           \
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libhdb/Makefile
--- a/lib/libhdb/Makefile       Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libhdb/Makefile       Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/08/19 09:41:30 lukem Exp $
+# $NetBSD: Makefile,v 1.15 2002/08/19 13:35:07 lukem Exp $
 
 NOLINT=                # defined
 
@@ -12,7 +12,7 @@
 LIB=           hdb
 
 .if ${USETOOLS} != "yes"
-COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILEETOBJ!= cd ${NETBSDSRCDIR}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
 
@@ -44,15 +44,15 @@
 INCSDIR=       /usr/include/krb5
 
 .if ${USETOOLS} != "yes"
-ASN1_COMPILE!= cd ${.CURDIR}/../libasn1/asn1_compile && ${PRINTOBJDIR}
+ASN1_COMPILE!= cd ${NETBSDSRCDIR}/lib/libasn1/asn1_compile && ${PRINTOBJDIR}
 ASN1_COMPILE:= ${ASN1_COMPILE}/asn1_compile
 .endif
 
 asn1_files hdb_asn1.hx: hdb.asn1
        ${ASN1_COMPILE} ${DIST}/heimdal/lib/hdb/hdb.asn1 hdb_asn1
 
-ASN1!=         cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR}
-KRB5!=         cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR}
+ASN1!=         cd ${NETBSDSRCDIR}/lib/libasn1 && ${PRINTOBJDIR}
+KRB5!=         cd ${NETBSDSRCDIR}/lib/libkrb5 && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.                                 \
         -I${DIST}/heimdal/lib/hdb              \
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libkadm/Makefile
--- a/lib/libkadm/Makefile      Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libkadm/Makefile      Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/08/19 09:41:31 lukem Exp $
+# $NetBSD: Makefile,v 1.12 2002/08/19 13:35:07 lukem Exp $
 
 NOLINT=                # defined
 
@@ -12,7 +12,7 @@
 LIB=           kadm
 
 .if ${USETOOLS} != "yes"
-COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILEETOBJ!= cd ${NETBSDSRCDIR}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
 
@@ -32,7 +32,7 @@
 INCS=          kadm.h kadm_err.h
 INCSDIR=       /usr/include/kerberosIV
 
-LIBKRBINC!=    cd ${.CURDIR}/../libkrb && ${PRINTOBJDIR}
+LIBKRBINC!=    cd ${NETBSDSRCDIR}/lib/libkrb && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.                                 \
        -I${DIST}/krb4/lib/kadm                 \
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libkadm5clnt/Makefile
--- a/lib/libkadm5clnt/Makefile Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libkadm5clnt/Makefile Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/08/19 09:41:31 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/19 13:35:07 lukem Exp $
 
 NOLINT=                # defined
 
@@ -12,7 +12,7 @@
 LIB=           kadm5clnt
 
 .if ${USETOOLS} != "yes"
-COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILEETOBJ!= cd ${NETBSDSRCDIR}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
 
@@ -46,9 +46,9 @@
 INCS=          kadm5_err.h admin.h kadm5-protos.h private.h kadm5-private.h
 INCSDIR=       /usr/include/kadm5
 
-ASN1!=         cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR}
-KRB5!=         cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR}
-HDB!=          cd ${.CURDIR}/../libhdb && ${PRINTOBJDIR}
+ASN1!=         cd ${NETBSDSRCDIR}/lib/libasn1 && ${PRINTOBJDIR}
+KRB5!=         cd ${NETBSDSRCDIR}/lib/libkrb5 && ${PRINTOBJDIR}
+HDB!=          cd ${NETBSDSRCDIR}/lib/libhdb && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.                                 \
         -I${ASN1}                              \
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libkadm5srv/Makefile
--- a/lib/libkadm5srv/Makefile  Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libkadm5srv/Makefile  Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/08/19 09:41:31 lukem Exp $
+# $NetBSD: Makefile,v 1.16 2002/08/19 13:35:08 lukem Exp $
 
 NOLINT=                # defined
 
@@ -14,7 +14,7 @@
 LIB=           kadm5srv
 
 .if ${USETOOLS} != "yes"
-COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILEETOBJ!= cd ${NETBSDSRCDIR}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
 
@@ -65,9 +65,9 @@
        set_modifier.c                          \
        $(ERR_FILES)
 
-ASN1!=         cd ${.CURDIR}/../libasn1 && ${PRINTOBJDIR}
-KRB5!=         cd ${.CURDIR}/../libkrb5 && ${PRINTOBJDIR}
-HDB!=          cd ${.CURDIR}/../libhdb && ${PRINTOBJDIR}
+ASN1!=         cd ${NETBSDSRCDIR}/lib/libasn1 && ${PRINTOBJDIR}
+KRB5!=         cd ${NETBSDSRCDIR}/lib/libkrb5 && ${PRINTOBJDIR}
+HDB!=          cd ${NETBSDSRCDIR}/lib/libhdb && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.                                 \
         -I${ASN1}                              \
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libkdb/Makefile
--- a/lib/libkdb/Makefile       Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libkdb/Makefile       Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/08/19 09:41:32 lukem Exp $
+# $NetBSD: Makefile,v 1.6 2002/08/19 13:35:08 lukem Exp $
 
 NOLINT=                # defined
 
@@ -17,7 +17,7 @@
 INCS=          krb_db.h
 INCSDIR=       /usr/include/kerberosIV
 
-LIBKRBINC!=    cd ${.CURDIR}/../libkrb && ${PRINTOBJDIR}
+LIBKRBINC!=    cd ${NETBSDSRCDIR}/lib/libkrb && ${PRINTOBJDIR}
 
 CPPFLAGS+= -I.                                 \
        -I${DIST}/krb4/lib/kdb                  \
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libkrb/Makefile
--- a/lib/libkrb/Makefile       Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libkrb/Makefile       Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/08/19 09:41:32 lukem Exp $
+# $NetBSD: Makefile,v 1.18 2002/08/19 13:35:08 lukem Exp $
 
 NOLINT=                # defined
 
@@ -25,7 +25,7 @@
 LIB=           krb
 
 .if ${USETOOLS} != "yes"
-COMPILEETOBJ!= cd ${.CURDIR}/../libcom_err/compile_et && ${PRINTOBJDIR}
+COMPILEETOBJ!= cd ${NETBSDSRCDIR}/lib/libcom_err/compile_et && ${PRINTOBJDIR}
 COMPILE_ET=    ${COMPILEETOBJ}/compile_et
 .endif
 
diff -r 87dfe860a891 -r 64fabfee8d29 lib/libkrb5/Makefile
--- a/lib/libkrb5/Makefile      Mon Aug 19 13:05:42 2002 +0000
+++ b/lib/libkrb5/Makefile      Mon Aug 19 13:35:05 2002 +0000
@@ -1,4 +1,4 @@



Home | Main Index | Thread Index | Old Index