You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

39 lines
2.2 KiB

  1. --- a/Makefile.SH 2017-10-15 18:57:08.436234652 -0600
  2. +++ b/Makefile.SH 2017-10-15 19:02:47.587658819 -0600
  3. @@ -328,7 +328,7 @@ PATH_SEP = $p_
  4. # Macros to invoke a copy of miniperl during the build. Targets which
  5. # are built using these macros should depend on \$(MINIPERL_EXE)
  6. MINIPERL_EXE = miniperl\$(EXE_EXT)
  7. -MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib
  8. +MINIPERL = \$(LDLIBPTH) ./miniperl\$(EXE_EXT) -Ilib -I.
  9. # Macros to invoke sort the MANIFEST during build
  10. MANIFEST_SRT = MANIFEST.srt
  11. @@ -991,7 +991,7 @@ NAMESPACEFLAGS = -force_flat_namespace
  12. @$(RMS) miniperl.xok
  13. $(CC) $(CLDFLAGS) $(NAMESPACEFLAGS) -o $(MINIPERL_EXE) \
  14. $(miniperl_objs) $(libs)
  15. - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
  16. + $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -I. -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
  17. $(MINIPERL) -f write_buildcustomize.pl
  18. !NO!SUBS!
  19. ;;
  20. @@ -1002,16 +1002,16 @@ lib/buildcustomize.pl: $& $(miniperl_obj
  21. @\$(RMS) miniperl.xok
  22. @\$(RMS) \$(MINIPERL_EXE)
  23. \$(LNS) \$(HOST_PERL) \$(MINIPERL_EXE)
  24. - \$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
  25. + \$(LDLIBPTH) ./miniperl\$(HOST_EXE_EXT) -w -Ilib -I. -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
  26. \$(MINIPERL) -f write_buildcustomize.pl 'osname' "$osname"
  27. !GROK!THIS!
  28. else
  29. $spitshell >>$Makefile <<'!NO!SUBS!'
  30. lib/buildcustomize.pl: $& $(miniperl_dep) write_buildcustomize.pl
  31. @$(RMS) miniperl.xok
  32. $(CC) $(CLDFLAGS) -o $(MINIPERL_EXE) \
  33. $(miniperl_objs) $(libs)
  34. - $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
  35. + $(LDLIBPTH) ./miniperl$(HOST_EXE_EXT) -w -Ilib -I. -Idist/Exporter/lib -MExporter -e '<?>' || sh -c 'echo >&2 Failed to build miniperl. Please run make minitest; exit 1'
  36. $(MINIPERL) -f write_buildcustomize.pl
  37. !NO!SUBS!
  38. fi