diff options
| author | Winfried <szukw000@arcor.de> | 2010-10-18 00:17:19 +0000 |
|---|---|---|
| committer | Winfried <szukw000@arcor.de> | 2010-10-18 00:17:19 +0000 |
| commit | b55fd4bf461eb170df78da404376f4028fe0812e (patch) | |
| tree | bf5af592c7c4816152fc2945d5299bfd7c562520 | |
| parent | 41a07019cabe651fb6d7a424ab40c01c9e8a66b0 (diff) | |
M jp3d/Makefile.nix
M config.nix
M doc/Makefile.in
M doc/Makefile.am
M doc/Makefile.nix
M CHANGES
M jpwl/Makefile.nix
M Makefile.nix
| -rw-r--r-- | Makefile.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile.nix b/Makefile.nix index d153dbe0..0dd57ea3 100644 --- a/Makefile.nix +++ b/Makefile.nix @@ -83,7 +83,7 @@ ifeq ($(ENABLE_SHARED),yes) (cd $(DESTDIR)$(INSTALL_LIBDIR) && \ ln -sf $(LIBNAME).so.$(JP3D_MAJOR).$(JP3D_MINOR) $(LIBNAME).so ) endif - ldconfig + $(LDCONFIG) install -d $(DESTDIR)$(INSTALL_INCLUDE) rm -f $(DESTDIR)$(INSTALL_INCLUDE)/openjpeg.h install -m 644 -o root -g root libjp3dvm/openjpeg.h \ @@ -98,7 +98,7 @@ ifeq ($(ENABLE_SHARED),yes) (cd $(DESTDIR)$(INSTALL_LIBDIR) && \ rm -f $(LIBNAME).so $(LIBNAME).so.$(JP3D_MAJOR).$(JP3D_MINOR) $(SHAREDLIB)) endif - ldconfig + $(LDCONFIG) rm -f $(DESTDIR)$(prefix)/include/openjpeg3d.h rm -rf $(DESTDIR)$(INSTALL_INCLUDE) make -C codec -f Makefile.nix uninstall |