diff options
| author | Bodo Möller <bodo@openssl.org> | 1999-04-23 22:13:45 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 1999-04-23 22:13:45 +0000 |
| commit | ec577822f95a8bca0023c5c77cef1a4916822d4a (patch) | |
| tree | 206e75c0178ff0719b87a4d94e261fc243ce42a8 /util | |
| parent | 806115771c7a056756cb5f93bb3aaa71cd418e49 (diff) | |
Change #include filenames from <foo.h> to <openssl.h>.
Submitted by:
Reviewed by:
PR:
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 13 | ||||
| -rwxr-xr-x | util/mklink.sh | 11 |
2 files changed, 19 insertions, 5 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 2bf9584ce5..c936d785cf 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -307,6 +307,7 @@ OUT_D=$out_dir TMP_D=$tmp_dir # The output directory for the header files INC_D=$inc_dir +INCO_D=$inc_dir${o}openssl CP=$cp RM=$rm @@ -365,7 +366,7 @@ LIBS_DEP=\$(O_CRYPTO) \$(O_RSAGLUE) \$(O_SSL) EOF $rules=<<"EOF"; -all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INC_D) headers lib exe +all: banner \$(TMP_D) \$(BIN_D) \$(TEST_D) \$(LIB_D) \$(INCO_D) headers lib exe banner: $banner @@ -382,6 +383,9 @@ $banner \$(LIB_D): \$(MKDIR) \$(LIB_D) +\$(INCO_D): \$(INC_D) + \$(MKDIR) \$(INC_D)${o}openssl + \$(INC_D): \$(MKDIR) \$(INC_D) @@ -395,8 +399,9 @@ install: \$(MKDIR) \$(INSTALLTOP) \$(MKDIR) \$(INSTALLTOP)${o}bin \$(MKDIR) \$(INSTALLTOP)${o}include + \$(MKDIR) \$(INSTALLTOP)${o}include${o}openssl \$(MKDIR) \$(INSTALLTOP)${o}lib - \$(CP) \$(INC_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include + \$(CP) \$(INCO_D)${o}*.\[ch\] \$(INSTALLTOP)${o}include${o}openssl \$(CP) \$(BIN_D)$o\$(E_EXE)$exep \$(INSTALLTOP)${o}bin \$(CP) \$(O_SSL) \$(INSTALLTOP)${o}lib \$(CP) \$(O_CRYPTO) \$(INSTALLTOP)${o}lib @@ -476,8 +481,8 @@ chop($h); $header=$h; $defs.=&do_defs("HEADER",$header,"\$(INCL_D)",".h"); $rules.=&do_copy_rule("\$(INCL_D)",$header,".h"); -$defs.=&do_defs("EXHEADER",$exheader,"\$(INC_D)",".h"); -$rules.=&do_copy_rule("\$(INC_D)",$exheader,".h"); +$defs.=&do_defs("EXHEADER",$exheader,"\$(INCO_D)",".h"); +$rules.=&do_copy_rule("\$(INCO_D)",$exheader,".h"); $defs.=&do_defs("T_OBJ",$test,"\$(OBJ_D)",$obj); $rules.=&do_compile_rule("\$(OBJ_D)",$test,"\$(APP_CFLAGS)"); diff --git a/util/mklink.sh b/util/mklink.sh index 015586a9c3..3eeba67b2e 100755 --- a/util/mklink.sh +++ b/util/mklink.sh @@ -12,6 +12,15 @@ shift here=`pwd` tmp=`dirname $from` +prefix='..' + +while [ `basename $tmp`x != ..x -a `basename $tmp`x != .x ] +do + prefix=../$prefix + tmp=`dirname $tmp` +done + +to='' while [ "$tmp"x != "x" -a "$tmp"x != ".x" ] do t=`basename $here` @@ -19,7 +28,7 @@ do to="/$t$to" tmp=`dirname $tmp` done -to=..$to +to=$prefix$to if [ "$*"x != "x" ]; then for i in $* |