diff options
Diffstat (limited to 'applets')
| -rw-r--r-- | applets/Makefile.in | 20 | ||||
| -rwxr-xr-x | applets/install.sh | 3 |
2 files changed, 7 insertions, 16 deletions
diff --git a/applets/Makefile.in b/applets/Makefile.in index 02bcda93b..64aefc017 100644 --- a/applets/Makefile.in +++ b/applets/Makefile.in @@ -4,23 +4,13 @@ # # Licensed under the GPL v2, see the file LICENSE in this tarball. -APPLETS_AR:=applets.a -ifndef $(APPLETS_DIR) -APPLETS_DIR:=$(top_builddir)/applets/ -endif srcdir=$(top_srcdir)/applets +objdir=$(top_builddir)/applets -APPLET_SRC:= $(patsubst %,$(srcdir)/%,applets.c busybox.c version.c) -APPLET_OBJ:= $(patsubst $(srcdir)/%.c,$(APPLETS_DIR)%.o, $(APPLET_SRC)) +APPLETS_SRC:= $(patsubst %,$(srcdir)/%,applets.c busybox.c version.c) -APPLET_SRC-y+=$(APPLET_SRC) -APPLET_SRC-a+=$(APPLET_SRC) +APPLET_SRC-y+=$(APPLETS_SRC) +APPLET_SRC-a+=$(APPLETS_SRC) -libraries-y+=$(APPLETS_DIR)$(APPLETS_AR) +applets_OBJ:=$(patsubst $(srcdir)/%.c,$(objdir)/%.o,$(APPLETS_SRC)) -$(APPLETS_DIR)$(APPLETS_AR): $(APPLET_OBJ) - $(do_ar) - -$(APPLET_OBJ): $(top_builddir)/.config -$(APPLET_OBJ): $(APPLETS_DIR)%.o: $(srcdir)/%.c - $(compile.c) diff --git a/applets/install.sh b/applets/install.sh index 2c643f2f2..0173e7a44 100755 --- a/applets/install.sh +++ b/applets/install.sh @@ -28,7 +28,8 @@ if [ "$DO_INSTALL_LIBS" != "n" ]; then for i in $DO_INSTALL_LIBS; do rm -f $prefix/$libdir/$i || exit 1 if [ -f $i ]; then - install -m 644 $i $prefix/$libdir/ || exit 1 + cp -a $i $prefix/$libdir/ || exit 1 + chmod 0644 $prefix/$libdir/$i || exit 1 fi done fi |