summaryrefslogtreecommitdiff
path: root/usr/src/cmd/ccidadm
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/cmd/ccidadm')
-rw-r--r--usr/src/cmd/ccidadm/Makefile7
-rw-r--r--usr/src/cmd/ccidadm/ccidadm.c2
2 files changed, 3 insertions, 6 deletions
diff --git a/usr/src/cmd/ccidadm/Makefile b/usr/src/cmd/ccidadm/Makefile
index de9761ff9d..d1d9221c80 100644
--- a/usr/src/cmd/ccidadm/Makefile
+++ b/usr/src/cmd/ccidadm/Makefile
@@ -18,15 +18,12 @@ PROG= ccidadm
include ../Makefile.cmd
include ../Makefile.ctf
-ROOTCMDDIR = $(ROOTLIB)/ccid
CFLAGS += $(CCVERBOSE)
LDLIBS += -lofmt -lcmdutils
SRCS = ccidadm.c atr.c
OBJS = $(SRCS:%.c=%.o)
CPPFLAGS += -I$(SRC)/common/ccid
-ROOTCCIDFILES = $(PROG:%=$(ROOTCMDDIR)/%)
-
.KEEP_STATE:
$(PROG): $(OBJS)
@@ -43,9 +40,9 @@ $(PROG): $(OBJS)
all: $(PROG)
-install: all $(ROOTCMD)
+install: all $(ROOTUSRSBINPROG)
clean:
- $(RM) $(OBJS)
+ $(RM) $(OBJS) $(PROG)
include ../Makefile.targ
diff --git a/usr/src/cmd/ccidadm/ccidadm.c b/usr/src/cmd/ccidadm/ccidadm.c
index 1d3c2bcbfc..6309ecfcc8 100644
--- a/usr/src/cmd/ccidadm/ccidadm.c
+++ b/usr/src/cmd/ccidadm/ccidadm.c
@@ -220,7 +220,7 @@ static boolean_t
ccidadm_list_slot_usable_str(uccid_cmd_status_t *ucs, char *buf,
uint_t buflen)
{
- char *un = "";
+ const char *un = "";
ccid_class_features_t feat;
uint_t prot = CCID_CLASS_F_SHORT_APDU_XCHG | CCID_CLASS_F_EXT_APDU_XCHG;
uint_t param = CCID_CLASS_F_AUTO_PARAM_NEG | CCID_CLASS_F_AUTO_PPS;