mirror of
https://github.com/git/git.git
synced 2025-12-23 12:14:22 +01:00
Merge branch 'tu/credential-install'
Contributed credential helpers (obviously in contrib/) now have "cd $there && make install" target. * tu/credential-install: contrib/credential: add install target
This commit is contained in:
@@ -10,6 +10,7 @@ gitexecdir ?= $(prefix)/libexec/git-core
|
|||||||
CC ?= gcc
|
CC ?= gcc
|
||||||
CFLAGS ?= -g -O2 -Wall
|
CFLAGS ?= -g -O2 -Wall
|
||||||
PKG_CONFIG ?= pkg-config
|
PKG_CONFIG ?= pkg-config
|
||||||
|
INSTALL ?= install
|
||||||
RM ?= rm -f
|
RM ?= rm -f
|
||||||
|
|
||||||
INCS:=$(shell $(PKG_CONFIG) --cflags libsecret-1 glib-2.0)
|
INCS:=$(shell $(PKG_CONFIG) --cflags libsecret-1 glib-2.0)
|
||||||
@@ -21,7 +22,11 @@ LIBS:=$(shell $(PKG_CONFIG) --libs libsecret-1 glib-2.0)
|
|||||||
git-credential-libsecret: git-credential-libsecret.o
|
git-credential-libsecret: git-credential-libsecret.o
|
||||||
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
|
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) $(LIBS)
|
||||||
|
|
||||||
|
install: git-credential-libsecret
|
||||||
|
$(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)
|
||||||
|
$(INSTALL) -m 755 $< $(DESTDIR)$(gitexecdir)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) git-credential-libsecret git-credential-libsecret.o
|
$(RM) git-credential-libsecret git-credential-libsecret.o
|
||||||
|
|
||||||
.PHONY: all clean
|
.PHONY: all install clean
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ gitexecdir ?= $(prefix)/libexec/git-core
|
|||||||
|
|
||||||
CC ?= gcc
|
CC ?= gcc
|
||||||
CFLAGS ?= -g -O2 -Wall
|
CFLAGS ?= -g -O2 -Wall
|
||||||
|
INSTALL ?= install
|
||||||
RM ?= rm -f
|
RM ?= rm -f
|
||||||
|
|
||||||
%.o: %.c
|
%.o: %.c
|
||||||
@@ -18,7 +19,11 @@ git-credential-osxkeychain: git-credential-osxkeychain.o
|
|||||||
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) \
|
$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS) \
|
||||||
-framework Security -framework CoreFoundation
|
-framework Security -framework CoreFoundation
|
||||||
|
|
||||||
|
install: git-credential-osxkeychain
|
||||||
|
$(INSTALL) -d -m 755 $(DESTDIR)$(gitexecdir)
|
||||||
|
$(INSTALL) -m 755 $< $(DESTDIR)$(gitexecdir)
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
$(RM) git-credential-osxkeychain git-credential-osxkeychain.o
|
$(RM) git-credential-osxkeychain git-credential-osxkeychain.o
|
||||||
|
|
||||||
.PHONY: all clean
|
.PHONY: all install clean
|
||||||
|
|||||||
Reference in New Issue
Block a user