diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 21:22:59 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-07-27 21:22:59 -0400 |
| commit | e16e20038bff3a72fb14c3fac8a923dc6a7be327 (patch) | |
| tree | c735a7670956b49c2058aafd1e2ac80213e8e521 | |
| parent | cc3d6b3f24ae5e5e8f2e87c1d059656203c0fc1b (diff) | |
| parent | 75482140a4e31bc56074dae645175946499c2181 (diff) | |
Merge branch 'lukeshu/postmove' into lukeshu/master
# Conflicts:
# src/libsystemd/src/sd-journal/Makefile
| -rwxr-xr-x | move.sh | 1 | ||||
| -rw-r--r-- | src/libsystemd/src/sd-journal/Makefile | 1 |
2 files changed, 1 insertions, 1 deletions
@@ -321,6 +321,7 @@ fixup_makefiles() ( -e '/^[^# ]*:/ { s|\S+/|$(outdir)/|g }' \ src/libbasic/Makefile \ src/libsystemd/src/Makefile \ + src/libsystemd/src/sd-journal/Makefile \ src/grp-udev/libudev-core/Makefile find -type f -name Makefile|while read -r filename; do sed -r -i "s|(/\.\.)*/config.mk|/$(realpath -ms --relative-to="${filename%/*}" config.mk)|" "$filename" diff --git a/src/libsystemd/src/sd-journal/Makefile b/src/libsystemd/src/sd-journal/Makefile index 7f1caf0836..0064892fb5 100644 --- a/src/libsystemd/src/sd-journal/Makefile +++ b/src/libsystemd/src/sd-journal/Makefile @@ -20,7 +20,6 @@ # # You should have received a copy of the GNU Lesser General Public License # along with systemd; If not, see <http://www.gnu.org/licenses/>. - include $(dir $(lastword $(MAKEFILE_LIST)))/../../../../config.mk include $(topsrcdir)/build-aux/Makefile.head.mk |