diff options
-rw-r--r-- | Makefile.am | 10 | ||||
-rw-r--r-- | cfg.mk | 1 | ||||
-rw-r--r-- | libltdl/ltdl.mk | 2 |
3 files changed, 6 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am index b49e440e..6c986daa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -211,9 +211,9 @@ $(lt_Makefile_am): $(ltdl_mk) '$(SED)' -n '/^.. DO NOT REMOVE THIS LINE -- /,$$p' \ '$(ltdl_mk)' \ |'$(SED)' -e 's,libltdl_,,; s,libltdl/,,; s,: libltdl/,: ,' \ - -e 's,\$$(libltdl_,$$(,' \ + -e 's,\$$(libltdl_,$$(,' \ ) |'$(SED)' -e '/^.. DO NOT REMOVE THIS LINE -- /d' \ - -e '1s,^\(.. Makefile.\)inc.*,\1am -- Process this file with automake to produce Makefile.in,' > '$@' + -e '1s,^\(.. Makefile.\)inc.*,\1am -- Process this file with automake to produce Makefile.in,' > '$@' $(AM_V_at)chmod a-w '$@' ## Document the make macros that are needed to build bootstrap-deps @@ -367,9 +367,9 @@ $(stamp_mk): $(lt_Makefile_in) case " $(pkgaux_scripts) ltmain.sh " in \ *" $$f "*) ;; \ *) '$(SED)' \ - -e 's,\(\$$([^)]*)/\)*'"$(ltdl_ac_aux_dir)/$$f"'\$$,,' \ - -e 's,\(\$$([^)]*)/\)*'"$(ltdl_ac_aux_dir)/$$f"' ,,' \ - -e '/^[ ]*\\$$/d' \ + -e 's,\(\$$([^)]*)/\)*'"$(ltdl_ac_aux_dir)/$$f"'\$$,,' \ + -e 's,\(\$$([^)]*)/\)*'"$(ltdl_ac_aux_dir)/$$f"' ,,' \ + -e '/^[ ]*\\$$/d' \ '$(lt_Makefile_in)' > "$$T" \ && mv -f "$$T" '$(lt_Makefile_in)';; \ esac; \ @@ -38,7 +38,6 @@ endif VC_LIST_ALWAYS_EXCLUDE_REGEX = ^mail/ local-checks-to-fix = \ - sc_makefile_TAB_only_indentation \ sc_makefile_at_at_check \ sc_prohibit_always-defined_macros \ sc_prohibit_always_true_header_tests \ diff --git a/libltdl/ltdl.mk b/libltdl/ltdl.mk index f75d6fd4..bc31f62c 100644 --- a/libltdl/ltdl.mk +++ b/libltdl/ltdl.mk @@ -60,7 +60,7 @@ libltdl_libltdl_la_SOURCES = libltdl/libltdl/lt__alloc.h \ libltdl/libltdl/lt__strl.h \ libltdl/libltdl/lt_dlloader.h \ libltdl/libltdl/lt_error.h \ - libltdl/libltdl/lt_system.h \ + libltdl/libltdl/lt_system.h \ libltdl/libltdl/slist.h \ libltdl/loaders/preopen.c \ libltdl/lt__alloc.c \ |