ncurses 6.1 - patch 20180324

[ncurses.git] / mk-1st.awk

diff --git a/mk-1st.awk b/mk-1st.awk
index da40cc64cefc2803b5db60f0443f580732d6cc92..969d9401249eb3904e1c2f4a524cf03ba6c42209 100644 (file)
--- a/mk-1st.awk
+++ b/mk-1st.awk
@@ -1,6 +1,6 @@
-# $Id: mk-1st.awk,v 1.96 2013/09/07 17:54:05 Alexey.Pavlov Exp $
+# $Id: mk-1st.awk,v 1.101 2017/12/02 23:29:29 tom Exp $
 ##############################################################################
-# Copyright (c) 1998-2012,2013 Free Software Foundation, Inc.                #
+# Copyright (c) 1998-2016,2017 Free Software Foundation, Inc.                #
 #                                                                            #
 # Permission is hereby granted, free of charge, to any person obtaining a    #
 # copy of this software and associated documentation files (the "Software"), #
@@ -170,7 +170,7 @@ function removelinks(directory) {
                }
        }
 function make_shlib(objs, shlib_list) {
-               printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s) $(LDFLAGS)\n", objs, shlib_list
+               printf "\t$(MK_SHARED_LIB) $(%s_OBJS) $(%s)\n", objs, shlib_list
        }
 function sharedlinks(directory) {
                if ( ShlibVer != "auto" && ShlibVer != "cygdll" && ShlibVer != "msysdll" && ShlibVer != "mingw" ) {
@@ -220,7 +220,7 @@ function shlib_build(directory) {
                        printf "\t\t%s/%s \\\n", directory, termlib_end_of();
                        suffix = save_suffix
                }
-               printf "\t\t$(%s_OBJS)\n", OBJS
+               printf "\t\t$(RESULTING_SYMS) $(%s_OBJS)\n", OBJS
                printf "\t@echo linking $@\n"
                if ( is_ticlib() ) {
                        make_shlib(OBJS, "TICS_LIST")
@@ -448,7 +448,7 @@ END {
                                }
                                printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) $(%s) \\\n", CC_NAME, CC_FLAG;
                                printf "\t\t-o %s $(%s_OBJS:$o=.lo) \\\n", lib_name, OBJS;
-                               printf "\t\t-rpath $(DESTDIR)$(libdir) \\\n";
+                               printf "\t\t-rpath $(libdir) \\\n";
                                printf "\t\t%s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", libtool_version, which_list;
                                print  ""
                                print  "install \\"