diff options
Diffstat (limited to 'c++/Makefile.in')
| -rw-r--r-- | c++/Makefile.in | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in index 99f21da480fa..f03468bb519b 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.133 2021/07/03 18:53:57 tom Exp $ +# $Id: Makefile.in,v 1.139 2025/10/18 13:33:46 tom Exp $ ############################################################################## -# Copyright 2018-2020,2021 Thomas E. Dickey # +# Copyright 2018-2024,2025 Thomas E. Dickey # # Copyright 1998-2015,2016 Free Software Foundation, Inc. # # # # Permission is hereby granted, free of charge, to any person obtaining a # @@ -38,13 +38,13 @@ SHELL = @SHELL@ VPATH = @srcdir@ -CF_MFLAGS = @cf_cv_makeflags@ @SET_MAKE@ +@SET_DESTDIR@ + x = @EXEEXT@ o = .@OBJEXT@ MODEL = ../@DFT_OBJ_SUBDIR@ -DESTDIR = @DESTDIR@ top_srcdir = @top_srcdir@ srcdir = @srcdir@ prefix = @prefix@ @@ -54,7 +54,9 @@ libdir = @libdir@ includedir = @includedir@ includesubdir = @includesubdir@ -INCLUDEDIR = $(DESTDIR)$(includedir)$(includesubdir) +INCLUDEDIR = $(DESTDIR)$(includedir@MERGE_PREFIX@)$(includesubdir) +BINDIR = $(DESTDIR)$(bindir@MERGE_PREFIX@) +LIBDIR = $(DESTDIR)$(libdir@MERGE_PREFIX@) PACKAGE = @PACKAGE@ @@ -115,15 +117,15 @@ LOCAL_LIBDIR = @top_builddir@/lib LINK = @LINK_PROGS@ $(LIBTOOL_LINK) @CXXLDFLAGS@ SHLIB_DIRS = -L../lib SHLIB_LIST = $(SHLIB_DIRS) \ - -l@FORM_NAME@@USE_LIB_SUFFIX@ \ - -l@MENU_NAME@@USE_LIB_SUFFIX@ \ - -l@PANEL_NAME@@USE_LIB_SUFFIX@ \ - -lncurses@USE_LIB_SUFFIX@ @SHLIB_LIST@ + -l@FORM_NAME@@ABI_SUFFIX@ \ + -l@MENU_NAME@@ABI_SUFFIX@ \ + -l@PANEL_NAME@@ABI_SUFFIX@ \ + -lncurses@ABI_SUFFIX@ @SHLIB_LIST@ LIBROOT = ncurses++ -LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT)@USE_LIB_SUFFIX@.la -LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@USE_LIB_SUFFIX@.a +LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT)@ABI_SUFFIX@.la +LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@ABI_SUFFIX@.a LIBNAME = @LIB_PREFIX@$(LIBROOT)@CXX_LIB_SUFFIX@ LIBRARIES = @Libs_To_Make@ @@ -132,7 +134,7 @@ LINT = @LINT@ LINT_OPTS = @LINT_OPTS@ LINT_LIBS = -lncurses @LIBS@ -LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@USE_LIB_SUFFIX@ +LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -l$(LIBROOT)@ABI_SUFFIX@ RPATH_LIST = @RPATH_LIST@ MK_SHARED_LIB = @MK_SHARED_LIB@ @@ -191,7 +193,7 @@ sources : $(AUTO_SRC) tags: $(CTAGS) *.[h] *.cc -$(DESTDIR)$(libdir) : +$(LIBDIR) : mkdir -p $@ mostlyclean :: |